I like monkeys - Federico

svn path=/trunk/; revision=6981

25 files changed, 70059 insertions, 39313 deletions

diff --git a/po/ca.po b/po/ca.po
index 26dbcabaf8..0f8057c889 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.0.6\n"
-"POT-Creation-Date: 2000-11-01 03:03+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -15,14 +15,245 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/e-card.c:3046
+#, fuzzy
+msgid "Card: "
+msgstr "Cotxe"
+
+#: addressbook/backend/ebook/e-card.c:3048
+#, fuzzy
+msgid ""
+"\n"
+"Name: "
+msgstr "Nom:"
+
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3053
+#, fuzzy
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr "_Sufix:"
+
+#: addressbook/backend/ebook/e-card.c:3067
+#, fuzzy
+msgid ""
+"\n"
+"Birth Date: "
+msgstr "Data d'ini_ci:"
+
+#: addressbook/backend/ebook/e-card.c:3078
+#, fuzzy
+msgid ""
+"\n"
+"Address:"
+msgstr "_AdreГa:"
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3086
+#, fuzzy
+msgid ""
+"\n"
+"  Country:     "
+msgstr "PaМ_s:"
+
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3138
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr "AdreГa electrРnica 2"
+
+#: addressbook/backend/ebook/e-card.c:3141
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:"
+msgstr "AdreГa electrРnica 2"
+
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3178
+#, fuzzy
+msgid ""
+"\n"
+"Business Role: "
+msgstr "Feina 2"
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3191
+#, fuzzy
+msgid ""
+"\n"
+"  Name:  "
+msgstr "Nom:"
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3199
+#, fuzzy
+msgid ""
+"\n"
+"Categories: "
+msgstr "categories"
+
+#: addressbook/backend/ebook/e-card.c:3200
+#, fuzzy
+msgid ""
+"\n"
+"Comment: "
+msgstr "Comentaris sobre l'element:"
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3216
+#, fuzzy
+msgid ""
+"\n"
+"Public Key: "
+msgstr "PЗblic"
+
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: 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:1064
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1058
-#: calendar/conduits/todo/todo-conduit.c:932 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "No s'ha pogut inicialitzar el Bonobo"
 
@@ -147,25 +378,28 @@ msgstr ""
 "S'ha produОt un error en intentar recollir\n"
 "la llista del Pilot del dimoni gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:194
-#: addressbook/conduit/address-conduit.c:208
-msgid "BLARG\n"
-msgstr "BLARG\n"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:210
+msgid "EBook not loaded\n"
+msgstr ""
 
-#: addressbook/conduit/address-conduit.c:638
-#: calendar/conduits/calendar/calendar-conduit.c:622
-#: calendar/conduits/todo/todo-conduit.c:495
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "No s'ha pogut iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:639
-#: calendar/conduits/calendar/calendar-conduit.c:623
-#: calendar/conduits/todo/todo-conduit.c:496
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "No s'ha pogut iniciar el wombat"
 
-#: addressbook/conduit/address-conduit.c:665
-#: addressbook/conduit/address-conduit.c:668
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС d'adreГa del Pilot"
 
@@ -186,113 +420,11 @@ msgstr "El(s) element(s) pertanyen a aquestes categories:"
 msgid "Available Categories:"
 msgstr "Categories disponibles:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr "Feina"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr "Feina 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr "Fax de la feina"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr "Crida de retorn"
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr "Cotxe"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr "Empresa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr "Particular"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr "Particular 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr "Fax particular"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr "XDSI"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr "MРbil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "Altres"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr "Un altre fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr "Busca"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr "Primari"
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr "RЮdio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr "TХlex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr "AdreГa electrРnica principal"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr "AdreГa electrРnica 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-msgstr "AdreГa electrРnica 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Esteu segur que voleu\n"
-"suprimir aquest contacte?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Voleu suprimir el contacte?"
 
@@ -306,7 +438,7 @@ msgid "_Add"
 msgstr "_Afegeix"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-mail.h:48
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Suprimeix"
 
@@ -319,11 +451,13 @@ msgstr "Tipus de telХfon"
 msgid "New phone type"
 msgstr "Nou tipus de telХfon"
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:71 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Afegeix"
 
@@ -363,6 +497,11 @@ msgstr "Fax de la feina"
 msgid "_Mobile"
 msgstr "_MРbil"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "AdreГa electrРnica principal"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "F_eina"
@@ -376,7 +515,7 @@ msgid "C_ontacts..."
 msgstr "C_ontactes..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegories..."
 
@@ -393,7 +532,7 @@ msgid "_Address..."
 msgstr "_AdreГa..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "General"
 
@@ -438,59 +577,146 @@ msgid "No_tes:"
 msgstr "No_tes:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detalls"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Feina"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Feina 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Fax de la feina"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Crida de retorn"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Cotxe"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Empresa"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Particular"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Particular 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Fax particular"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "XDSI"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Altres"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Un altre fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Busca"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Primari"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "RЮdio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "TХlex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "AdreГa electrРnica 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "AdreГa electrРnica 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "AdreГa _2:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "CanadЮ"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Comprova l'adreГa"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "PaМ_s:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "FinlЮndia"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "EUA"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_AdreГa:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_PoblaciС:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Apartat de correus:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "AdreГa _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Comarca:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "EUA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "CanadЮ"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "FinlЮndia"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Codi postal:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "PaМ_s:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -550,26 +776,25 @@ msgstr "_зltim:"
 msgid "_Suffix:"
 msgstr "_Sufix:"
 
-#: addressbook/gui/component/addressbook.c:310
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Com a _Minicards"
 
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:9
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Com a _taula"
 
-#: addressbook/gui/component/addressbook.c:444
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "No es pot obrir la llibreta d'adreces"
 
-#: addressbook/gui/component/addressbook.c:449
+#: addressbook/gui/component/addressbook.c:391
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -578,7 +803,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Ha estat impossible obrir aquesta llibreta d'adreces.\n"
 "AixР pot ser perquХ, o bИ heu introduОt un URI incorrecte,\n"
@@ -589,7 +814,32 @@ 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:584
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#, fuzzy
+msgid "Show All"
+msgstr "Mostra"
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#, fuzzy
+msgid "Advanced..."
+msgstr "Afegeix..."
+
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "El cos contИ"
+
+#: addressbook/gui/component/addressbook.c:534
+#, fuzzy
+msgid "Name contains"
+msgstr "contИ"
+
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "contИ"
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que mostrarЮ el navegador de carpetes"
 
@@ -598,172 +848,169 @@ msgid "External Directories"
 msgstr "Directoris externs"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "DescripciС:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "Nom:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "NЗmero de port:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr "DN arrel:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-msgstr "Nom:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Seleccioneu els noms"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Cerca..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "Destinataris del missatge"
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "Seleccioneu els noms"
+
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Seleccioneu un nom de la llista:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Destinataris del missatge"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Cerca"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "finestra2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Desa com a VCard"
 
@@ -785,197 +1032,187 @@ msgstr ""
 "\n"
 "Feu doble clic aquМ per crear un nou contacte."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:494
-msgid "Search"
-msgstr "Cerca"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "ConfiguraciС de la pЮgina:"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Nom de l'estil:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "PrevisualitzaciС:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Opcions"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "Inclou:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "Formularis en blanc al final:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "Seccions:"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Cos"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "Un segueix immediatament l'altre"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Inferior:"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "Tabuladors de carta al costat"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Dimensions:"
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "EncapГalaments per a cada carta"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Lletra..."
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "ComenГa en una nova pЮgina"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "Lletres"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "Nombre de columnes:"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "Peu de pЮgina:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "Formularis en blanc al final:"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "Lletres"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "CapГalera"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Lletra..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "CapГalera/Peu de pЮgina"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "EncapГalaments"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "EncapГalaments per a cada carta"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Cos"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "AlГada:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr "Un segueix immediatament l'altre"
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "Ombrejat"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "Inclou:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "Imprimeix usant ombrejat de grisos"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Horitzontal"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Format"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Esquerra:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Paper"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "Tabuladors de carta al costat"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Tipus:"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Marges"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "label26"
-msgstr "etiqueta26"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "Nombre de columnes:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Dimensions:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Opcions"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Amplada:"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "OrientaciС"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "AlГada:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "PЮgina"
+
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "ConfiguraciС de la pЮgina:"
+
+#: po/tmp/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
 msgid "Paper source:"
 msgstr "Font del paper:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Marges"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "Vertical"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "Superior:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "PrevisualitzaciС:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Inferior:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "Imprimeix usant ombrejat de grisos"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Esquerra:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "Inverteix-ho per a les pЮgines senars"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Dreta:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "PЮgina"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "Seccions:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "Ombrejat"
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Mida:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "OrientaciС"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Vertical"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "ComenГa en una nova pЮgina"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Horitzontal"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Nom de l'estil:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "CapГalera"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Superior:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "Peu de pЮgina:"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Tipus:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "Inverteix-ho per a les pЮgines senars"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Amplada:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "CapГalera/Peu de pЮgina"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "etiqueta26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
@@ -987,13 +1224,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:578
-#: calendar/conduits/todo/todo-conduit.c:451
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Error en comunicar-se amb el servidor d'agenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:676
-#: calendar/conduits/calendar/calendar-conduit.c:679
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "No s'ha pogut llegir el bloc d'aplicaciС d'agenda del Pilot"
 
@@ -1007,8 +1244,8 @@ msgstr ""
 "Utilitat de configuraciС per al conducte de les coses per fer de "
 "l'Evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:549
-#: calendar/conduits/todo/todo-conduit.c:552
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 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"
 
@@ -1052,49 +1289,46 @@ msgstr "Element per fer que venГ avui:"
 msgid "To-Do item that is overdue:"
 msgstr "Element endarrerit encara per fer:"
 
-#: calendar/gui/calendar-commands.c:386
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "No s'ha trobat el fitxer"
 
-#: calendar/gui/calendar-commands.c:410
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Obre l'agenda"
 
-#: calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Desa l'agenda"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "PЗblic"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -1126,7 +1360,7 @@ msgstr "Transparent"
 msgid "Opaque"
 msgstr "Opac"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1138,36 +1372,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
-#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 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:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1177,15 +1410,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor de percentatge ha d'estar entre 0 i 100, ambdСs inclosos"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 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/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrarЮ l'agenda"
 
@@ -1202,474 +1435,459 @@ msgid "No summary available."
 msgstr "No hi ha cap resum disponible."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-subscribe.h:10
+#: 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
 msgid "Close"
 msgstr "Tanca"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "'Snooze'"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Edita una cita"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "'Snooze'"
+
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Durada de l'snooze (minuts)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "PreferХncies de l'agenda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Setmana de treball"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "dl."
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "dm."
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "dc."
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "dj."
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 hores (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "dv."
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "ds."
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 hores"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "dg."
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "primer dia de la setmana:"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 minuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Dilluns"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr "Les alarmes es desactiven desprИs de"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Tuesday"
-msgstr "Dimarts"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "Alarmes acЗstiques"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Wednesday"
-msgstr "Dimecres"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr "Fes un so quan aparegui una finestra d'alarma."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "Thursday"
-msgstr "Dijous"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Agenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "Friday"
-msgstr "Divendres"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "PreferХncies de l'agenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "Saturday"
-msgstr "Dissabte"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Colors"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Diumenge"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr "Comprimeix els caps de setmana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "Inici del dia:"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr "Opcions del navegador de dates"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Final del dia:"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "Valors predeterminats"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Opcions de visualitzaciС"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "Divisions de temps:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "Format de l'hora:"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "Data de venciment"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
-msgstr "Mostra les hores d'acabament de les cites"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr "Habilita l'snoozing per a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
-msgstr "Comprimeix els caps de setmana"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Final del dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 hores (am/pm)"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "primer dia de la setmana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 hores"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "dv."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 minuts"
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Divendres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 minuts"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr "Ressalta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 minuts"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr "Elemts que vencen avui"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 minuts"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr "Elements que vencen avui:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 minuts"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr "Elements que encara no han venГut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Date navigator options"
-msgstr "Opcions del navegador de dates"
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
+msgstr "Elements que encara no han venГut:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
-msgstr "Mostra els nЗmeros de les setmanes"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "dl."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Agenda"
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Dilluns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
-msgstr "Mostra"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr "Elements venГuts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Data de venciment"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr "Elements que ja han venГut:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr "Temps fins al venciment"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "Agafa un color"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Prioritat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr "Ressalta"
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr "Recorda'm totes les cites"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
-msgstr "Elements venГuts"
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr "Recordatoris"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Items Due Today"
-msgstr "Elemts que vencen avui"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "ds."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
-msgstr "Elements que encara no han venГut"
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Dissabte"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Colors"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr "Mostra"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "Agafa un color"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr "Mostra les hores d'acabament de les cites"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Items Not Yet Due:"
-msgstr "Elements que encara no han venГut:"
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "Mostra els nЗmeros de les setmanes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
-msgstr "Elements que vencen avui:"
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "Inici del dia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Overdue Items:"
-msgstr "Elements que ja han venГut:"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "dg."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "TaskPad"
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Valors predeterminats"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Remind me of all appointments"
-msgstr "Recorda'm totes les cites"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
-msgstr "minuts abans que es produeixin."
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "dj."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr "Alarmes visuals"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Dijous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr "Fes un so quan aparegui una finestra d'alarma."
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr "Temps fins al venciment"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
-msgstr "Alarmes acЗstiques"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr "Divisions de temps:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
-msgstr "Les alarmes es desactiven desprИs de"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr "Format de l'hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "seconds."
-msgstr "segons."
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "dm."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr "Habilita l'snoozing per a"
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Dimarts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
-msgstr "Recordatoris"
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
+msgstr "Alarmes visuals"
 
-#: calendar/gui/dialogs/task-editor.c:657
-msgid "Edit Task"
-msgstr "Edita la tasca"
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "dc."
 
-#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:303
-msgid "No summary"
-msgstr "Sense resum"
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Dimecres"
 
-#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:309
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "Setmana de treball"
 
-#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:312
-#, c-format
-msgid "Task - %s"
-msgstr "Tasca - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr "minuts abans que es produeixin."
 
-#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:315
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Entrada al diari - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
+msgstr "segons."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
-msgstr "R_esum"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
-msgstr "Data d'ini_ci:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
-msgstr "_Data de venciment:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% comp_let:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "_Estat:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "No iniciat"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "C_lassificaciС:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "En procИs"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "Cancel╥lat"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Completat"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Cancel╥lat"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "_Prioritat:"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "Data completa:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Alta"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Normal"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "En procИs"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Baixa"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "C_lassificaciС:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22 shell/e-shell-view.c:989
-#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
-#: widgets/misc/e-dateedit.c:1171
+#. 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
 msgid "None"
 msgstr "Cap"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Contactes..."
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Normal"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "No iniciat"
+
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr "R_esum"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr "Data d'ini_ci:"
+
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Tasca"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "Data completa:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:294
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "_Contactes..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr "_Data de venciment:"
+
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "_Prioritat:"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "_Estat:"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr "task-editor-dialog"
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Edita la tasca"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Sense resum"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Tasca - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Entrada al diari - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "_Obre..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Obre la tasca"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Marca com a completa"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Marca la tasca com a completa"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:73 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:7
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:163
-#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-mail.h:13
+#: 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:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Suprimeix la tasca"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 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:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: 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
 msgid "New appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "Edita aquesta cita..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Suprimeix aquesta cita"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Fes aquesta cita movible"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Suprimeix-ne aquesta apariciС"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Suprimeix-ne totes les aparicions"
 
@@ -1680,247 +1898,203 @@ msgstr "Suprimeix-ne totes les aparicions"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:297
-msgid "Edit Appointment"
-msgstr "Edita una cita"
-
-#: calendar/gui/event-editor.c:342
-msgid "on"
-msgstr "el"
-
-#: calendar/gui/event-editor.c:470
-msgid "ocurrences"
-msgstr "aparicions"
-
-#: calendar/gui/event-editor.c:2371 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a, %d de %b de %Y"
-
-#. todo
 #.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "Su_mmary:"
-msgstr "Resu_m:"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "Temps"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "Hora d'_inici:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "Hora de _finalitzaciС:"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "Esdeveniment per a _tot el dia"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "Temes fonamentals sobre les cites"
+
+#: po/tmp/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "ClassificaciС"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "PЗ_blic"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "RecurrХncia personalitzada"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Pri_vat"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Dies"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
-msgstr "_Confidencial"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Cada"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minuts"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Excepcions"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: po/tmp/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Hores"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "Dies"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Envia per correu _a:"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Display"
-msgstr "_VisualitzaciС"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minuts"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr "_Programa"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "Modifica"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Mail"
-msgstr "_Correu"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Sense recurrХncia"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
-msgstr "Envia per correu _a:"
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "PrevisualitzaciС:"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Run program:"
-msgstr "_Executa el programa:"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Pri_vat"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "_юudio"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "PЗ_blic"
+
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "RecurrХncia"
+
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr "Regla de recurrХncia"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: po/tmp/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Recordatori"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Recur on the"
-msgstr "Repeteix-ho el dia"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr "RecurrХncia simple"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "th day of the month"
-msgstr "del mes"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr "Resu_m:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
-msgid "1st"
-msgstr "1"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Temps"
 
-#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "_юudio"
 
-#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "_Confidencial"
 
-#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
-msgid "4th"
-msgstr "4"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr "_VisualitzaciС"
 
-#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
-msgid "5th"
-msgstr "5"
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "Hora de _finalitzaciС:"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Every"
-msgstr "Cada"
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "_Correu"
 
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid "month(s)"
-msgstr "mes(os)"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Programa"
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Recurrence"
-msgstr "RecurrХncia"
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "_Executa el programa:"
 
-#: calendar/gui/event-editor-dialog.glade.h:55
-msgid "Appointment Basics"
-msgstr "Temes fonamentals sobre les cites"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "Hora d'_inici:"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Data d'_inici:"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence Rule"
-msgstr "Regla de recurrХncia"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "dia(es)"
 
-#: calendar/gui/event-editor-dialog.glade.h:59
-msgid "No recurrence"
-msgstr "Sense recurrХncia"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "event-editor-dialog"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "Simple recurrence"
-msgstr "RecurrХncia simple"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
+msgstr "per a"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-msgid "Custom recurrence"
-msgstr "RecurrХncia personalitzada"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr "per sempre"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "day(s)"
-msgstr "dia(es)"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "etiqueta21"
+
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "mes(os)"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "fins a"
 
-#: calendar/gui/event-editor-dialog.glade.h:64
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "setmana(es)"
 
-#: calendar/gui/event-editor-dialog.glade.h:66
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "any(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:67
-msgid "for"
-msgstr "per a"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Edita una cita"
 
-#: calendar/gui/event-editor-dialog.glade.h:68
-msgid "until"
-msgstr "fins a"
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "el"
 
-#: calendar/gui/event-editor-dialog.glade.h:69
-msgid "forever"
-msgstr "per sempre"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dia"
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid "Exceptions"
-msgstr "Excepcions"
+#: calendar/gui/event-editor.c:559
+#, fuzzy
+msgid "on the"
+msgstr "mes"
 
-#: calendar/gui/event-editor-dialog.glade.h:72
-msgid "Modify"
-msgstr "Modifica"
+#: calendar/gui/event-editor.c:566
+#, fuzzy
+msgid "th"
+msgstr "4"
 
-#: calendar/gui/event-editor-dialog.glade.h:74
-msgid "label21"
-msgstr "etiqueta21"
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
+msgstr "aparicions"
 
-#: calendar/gui/event-editor-dialog.glade.h:75
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
-"Aquesta cita tИ regles de recurrХncia personalitzades que l'Evolution no pot "
-"editar.\n"
-"\n"
-"No obstant aixР, la cita recurrirЮ en el moment oportЗ i es visualitzarЮ "
-"correctament en les vistes de l'agenda."
+
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a, %d de %b de %Y"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2018,11 +2192,11 @@ msgstr "divendres"
 msgid "saturday"
 msgstr "dissabte"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "any"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "mes"
 
@@ -2030,19 +2204,15 @@ msgstr "mes"
 msgid "fortnight"
 msgstr "quinzena"
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "setmana"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr "dia"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "hora"
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "minut"
 
@@ -2050,7 +2220,7 @@ msgstr "minut"
 msgid "min"
 msgstr "min."
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "segon"
 
@@ -2070,8 +2240,8 @@ msgstr "ahir"
 msgid "today"
 msgstr "avui"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "ara"
 
@@ -2136,52 +2306,29 @@ msgstr "dotzХ"
 msgid "ago"
 msgstr "fa"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "Crea un element per fer"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "Edita un element per fer"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Resum:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "Data de venciment:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Prioritat:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "Comentaris sobre l'element:"
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: 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/gnome-cal.c:1144
+#: 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/gnome-cal.c:1155
+#: 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/gnome-cal.c:1166
+#: 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"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "D'acord"
 
@@ -2208,6 +2355,26 @@ msgstr ""
 msgid "Go to today"
 msgstr "VИs a avui"
 
+#: calendar/gui/print.c:288
+msgid "1st"
+msgstr "1"
+
+#: calendar/gui/print.c:288
+msgid "2nd"
+msgstr "2"
+
+#: calendar/gui/print.c:288
+msgid "3rd"
+msgstr "3"
+
+#: calendar/gui/print.c:288
+msgid "4th"
+msgstr "4"
+
+#: calendar/gui/print.c:288
+msgid "5th"
+msgstr "5"
+
 #: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6"
@@ -2376,181 +2543,96 @@ msgstr "Enguany (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimeix l'agenda"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:833
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "PrevisualitzaciС d'impressiС"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "VisualitzaciС de l'hora"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Format de l'hora"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 hores (AM/PM)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 hores"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "La setmana comenГa el"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Abast de dies"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"Si us plau, seleccioneu les hores d'inici i\n"
-"finalitzaciС que voleu que es mostrin en les\n"
-"vistes de dia i de setmana. Per defecte, les\n"
-"hores fora d'aquest abast no es mostraran."
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "Inici del dia:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "Final del dia:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "Colors per a la visualitzaciС"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "Mostra-ho a la llista de coses per fer:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "Opcions d'estil de la llista de coses per fer:"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "Ressalta els elements endarrerits"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "Ressalta els elements que encara no han venГut"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "Ressalta els elemts que vencen avui"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "Propietats de la llista de coses per fer"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "Llista de coses per fer"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "PreferХncies"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmes"
+#. 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"
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "Propietats de l'alarma"
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#, fuzzy
+msgid "SMTWTFS"
+msgstr "DDDDDDD"
 
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "Fes un so en visualitzar les alarmes"
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
 
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "Les alarmes acЗstiques s'apaguen desprИs de"
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"S'ha excedit el temps mЮxim en intentar recuperar el fitxer de blocatge en "
+"%s. Torneu-ho a provar mИs tard."
 
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " segons"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
 
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "Habilita l'snoozing per a "
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
 
-#: camel/camel-movemail.c:96
+#: camel/camel-movemail.c:99
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "No s'ha pogut comprovar el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "No s'ha pogut crear el fitxer de blocatge per a %s: %s"
-
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer de correu %s: %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "No s'ha pogut obrir el fitxer temporal de correu %s: %s"
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "No s'ha pogut comprovar el fitxer de blocatge per a %s: %s"
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"S'ha excedit el temps mЮxim en intentar recuperar el fitxer de blocatge en "
-"%s. Torneu-ho a provar mИs tard."
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Error en llegir el fitxer de correu: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Error en escriure el fitxer temporal de correu: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "No s'ha pogut emmagatzemar el correu en el fitxer temporal %s: %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "No s'ha pogut crear el conducte: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "No s'ha pogut bifurcar: %s"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "El programa Movemail ha fallat: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Error desconegut)"
 
@@ -2565,56 +2647,60 @@ 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:185
+#: camel/camel-remote-store.c:182
 #, c-format
 msgid "%s server %s"
 msgstr "Servidor %s %s"
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "Servei %s per a %s en %s"
 
-#: camel/camel-remote-store.c:230
+#: camel/camel-remote-store.c:227
 #, 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:231 camel/providers/imap/camel-imap-store.c:190
+#: camel/camel-remote-store.c:228
 msgid "(unknown host)"
 msgstr "(ordinador central desconegut)"
 
-#: camel/camel-service.c:119
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' necessita un component de nom d'usuari"
 
-#: camel/camel-service.c:128
+#: camel/camel-service.c:129
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' necessita un component d'ordinador central"
 
-#: camel/camel-service.c:137
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' necessita un component de camМ"
 
-#: camel/camel-service.c:516
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr "L'ordinador central %s no existeix."
 
-#: camel/camel-service.c:519
+#: camel/camel-service.c:491
 #, 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:271
+#: camel/camel-session.c:272
 #, 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:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2623,51 +2709,68 @@ msgstr ""
 "No s'ha pogut crear el directori %s:\n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "La cadena d'URL `%s' no contИ cap protocol"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "La cadena d'URL `%s' contИ un protocol incorrecte"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:154
 #, c-format
 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-command.c:220
+#: camel/providers/imap/camel-imap-auth.c:127
+#, 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
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Resposta inesperada del servidor IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Resposta inesperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:228
+#: camel/providers/imap/camel-imap-command.c:224
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "L'ordre IMAP ha fallat: %s"
 
-#: camel/providers/imap/camel-imap-command.c:229 shell/e-storage.c:340
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Error desconegut"
 
-#: camel/providers/imap/camel-imap-command.c:370
+#: camel/providers/imap/camel-imap-command.c:271
+#, 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
 #, 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:406
+#: camel/providers/imap/camel-imap-command.c:443
 #, 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:219
+#: camel/providers/imap/camel-imap-folder.c:216
 #, 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:578
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "No s'ha pogut trobar el cos del missatge en la resposta al FETCH."
 
@@ -2679,29 +2782,36 @@ 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:161
-#: camel/providers/nntp/camel-nntp-store.c:292
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: 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:163
+#: camel/providers/imap/camel-imap-store.c:236
 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:188
-#, c-format
-msgid "Could not connect to IMAP server on %s."
-msgstr "No s'ha pogut connectar al servidor IMAP en %s."
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:247
+#, fuzzy
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
+msgstr ""
+"AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
+"autenticar-vos-hi."
 
-#: camel/providers/imap/camel-imap-store.c:252
+#: camel/providers/imap/camel-imap-store.c:333
 #, 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:274
+#: camel/providers/imap/camel-imap-store.c:359
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2712,55 +2822,205 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:479
+#: camel/providers/imap/camel-imap-store.c:539
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "No s'ha pogut crear el directori %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:220
-msgid "Could not create summary"
-msgstr "No s'ha pogut crear el resum"
+#: camel/providers/local/camel-local-provider.c:36
+#, fuzzy
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "Directoris de correu en format MH d'UNIX"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
+
+#: camel/providers/local/camel-local-provider.c:47
+#, fuzzy
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "Fitxers de correu en format mbox d'UNIX"
+
+#: camel/providers/local/camel-local-provider.c:48
+#, fuzzy
+msgid "For storing local mail in standard mbox format"
+msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+#, fuzzy
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
 
-#: camel/providers/mbox/camel-mbox-folder.c:383
-#: camel/providers/mbox/camel-mbox-folder.c:386
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "No es pot afegir el missatge al fitxer mbox: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "`%s' no Иs un fitxer habitual."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "No es pot bifurcar %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+#, fuzzy
+msgid "Local folders may not be nested."
+msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/mbox/camel-mbox-folder.c:489
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "No es pot recuperar el missatge: %s"
+msgid "Local mail file %s"
+msgstr "Fitxer de correu local %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "Fitxers de correu en format mbox d'UNIX"
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"No es pot recuperar el missatge: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
 msgstr ""
-"Per llegir el correu lliurat al sistema local i per emmagatzemar correu en "
-"el disc local."
 
-#: camel/providers/mbox/camel-mbox-store.c:121
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"No s'ha pogut obrir el fitxer `%s':\n"
+"No s'ha pogut obrir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:128
-#: camel/providers/mh/camel-mh-store.c:122
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existeix."
 
-#: camel/providers/mbox/camel-mbox-store.c:137
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"No s'ha pogut crear la carpeta `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' no Иs un directori."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Directori de correu local %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"No es pot recuperar el missatge: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"No s'ha pogut obrir el fitxer `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2769,14 +3029,14 @@ msgstr ""
 "No s'ha pogut crear el fitxer `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:146
-#: camel/providers/mbox/camel-mbox-store.c:180
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no Иs un fitxer habitual."
 
-#: camel/providers/mbox/camel-mbox-store.c:172
-#: camel/providers/mbox/camel-mbox-store.c:208
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2785,153 +3045,89 @@ msgstr ""
 "No s'ha pogut suprimir la carpeta `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:187
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no Иs buida. No s'ha suprimit."
 
-#: camel/providers/mbox/camel-mbox-store.c:225
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "No s'ha pogut obrir la carpeta: la llista de missatges era incompleta."
+
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
-"No s'ha pogut canviar el nom de la carpeta %s a %s: el nom de destМ ja "
-"existeix"
-
-#: camel/providers/mbox/camel-mbox-store.c:263
-msgid "Mbox folders may not be nested."
-msgstr "Les carpetes Mbox no es poden imbricar."
 
-#: camel/providers/mbox/camel-mbox-store.c:277
-#, c-format
-msgid "Local mail file %s"
-msgstr "Fitxer de correu local %s"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "No es pot bifurcar %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:650
-#, c-format
-msgid "Could not open summary %s"
-msgstr "No s'ha pogut obrir el resum %s"
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, 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/mbox/camel-mbox-summary.c:671
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No es pot obrir la bЗstia de correu temporal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:715
-msgid "Summary mismatch, aborting sync"
+#: 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
+#, fuzzy
+msgid "Summary and folder mismatch, even after a sync"
 msgstr "IncongruХncia del resum, s'estЮ interrompent la sincronitzaciС"
 
-#: camel/providers/mbox/camel-mbox-summary.c:735
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "IncongruХncia del resum, manca la capГalera de l'X-Evolution"
-
-#: camel/providers/mbox/camel-mbox-summary.c:757
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error en escriure a la bЗstia de correu temporal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:770
-#: camel/providers/mbox/camel-mbox-summary.c:788
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "No es poden copiar les dades al fitxer de sortida: %s"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, 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/mbox/camel-mbox-summary.c:813
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No s'ha pogut tancar la carpeta font %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:822
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No es pot tancar la carpeta temporal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No s'ha pogut canviar el nom de la carpeta: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:842
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconegut: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:211
-msgid "Could not load or create summary"
-msgstr "No s'ha pogut carregar o crear el resum"
-
-#: camel/providers/mh/camel-mh-folder.c:330
-#: camel/providers/mh/camel-mh-folder.c:333
-#, c-format
-msgid "Cannot append message to mh folder: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "No es pot afegir cap missatge a la carpeta mh: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:399
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"No es pot recuperar el missatge: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "Directoris de correu en format MH d'UNIX"
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Per emmagatzemar correu local en directoris de correu de tipus MH"
-
-#: camel/providers/mh/camel-mh-store.c:115
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"No s'ha pogut obrir la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:130
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"No s'ha pogut crear la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:139
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' no Иs un directori."
 
-#: camel/providers/mh/camel-mh-store.c:158
-#: camel/providers/mh/camel-mh-store.c:171
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "No s'ha pogut suprimir la carpeta `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:189
-#: camel/providers/mh/camel-mh-store.c:193
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:197
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s existeix"
-
-#: camel/providers/mh/camel-mh-store.c:205
-msgid "MH folders may not be nested."
-msgstr "Les carpetes MH no es poden imbricar."
-
-#: camel/providers/mh/camel-mh-store.c:217
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Directori de correu local %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -2949,7 +3145,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:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "No s'ha trobat el missatge %s."
@@ -2958,13 +3154,13 @@ msgstr "No s'ha trobat el missatge %s."
 msgid "Could not get group list from server."
 msgstr "No s'ha pogut aconseguir la llista de grups del servidor"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:93
-#: camel/providers/nntp/camel-nntp-grouplist.c:102
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "No es pot carregar el fitxer de llista de grups per a %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:151
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "No es pot desar el fitxer de llista de grups per a %s: %s"
@@ -2982,12 +3178,12 @@ msgstr "ProveОdor per llegir i publicar als grups de notМcies d'USENET."
 msgid "Could not open directory for news server: %s"
 msgstr "No s'ha pogut obrir el directori per al servidor de notМcies: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:287
+#: camel/providers/nntp/camel-nntp-store.c:288
 #, c-format
 msgid "USENET News via %s"
 msgstr "NotМcies d'USENET mitjanГant %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:294
+#: camel/providers/nntp/camel-nntp-store.c:295
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -2995,22 +3191,22 @@ msgstr ""
 "Aquesta opciС us autentica al servidor NNTP mitjanГant una contrasenya en "
 "text net"
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:499
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
 #, c-format
 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:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 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:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, 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:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, 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"
@@ -3028,7 +3224,7 @@ msgstr ""
 "recuperar correu des de determinats proveОdors de correu web i sistemes "
 "propietaris de correu."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:150
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3036,7 +3232,7 @@ 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/pop3/camel-pop3-store.c:162
+#: camel/providers/pop3/camel-pop3-store.c:160
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3046,29 +3242,29 @@ msgstr ""
 "xifrada mitjanГant el protocol APOP. AixР no funcionarЮ per a tots els "
 "usuaris, fins i tot en servidors que diuen que ho suporten."
 
-#: camel/providers/pop3/camel-pop3-store.c:174
+#: camel/providers/pop3/camel-pop3-store.c:172
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "AixР us connectarЮ al servidor POP i utilitzarЮ el Kerberos 4 per "
 "autenticar-vos-hi."
 
-#: camel/providers/pop3/camel-pop3-store.c:219
+#: camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 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:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, 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:391
+#: camel/providers/pop3/camel-pop3-store.c:389
 #, 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:410
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3077,12 +3273,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:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:411
+#: camel/providers/pop3/camel-pop3-store.c:448
 msgid "(Unknown)"
 msgstr "(Desconegut)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:438
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3090,7 +3286,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:448
+#: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3099,7 +3295,7 @@ msgstr ""
 "No es pot connectar al servidor POP.\n"
 "Error en enviar la contrasenya: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:554
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "La carpeta `%s' no existeix."
@@ -3169,107 +3365,107 @@ msgstr "ProveОdor de correu de la carpeta virtual"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Per llegir correu com a consulta d'un altre joc de carpetes"
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:94
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:98
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:299 mail/mail-display.c:118
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "adjunciС"
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: composer/e-msg-composer-attachment-bar.c:442 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/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:443
+#: composer/e-msg-composer-attachment-bar.c:465
 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:474
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Afegeix una adjunciС..."
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Adjunta un fitxer al missatge"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Propietats de l'adjunciС"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "Tipus de MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nom del fitxer:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+#: po/tmp/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
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Feu clic aquМ per a la llibreta d'adreces"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 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:300
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Per a:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "IntroduОu els destinataris del missatge"
 
-#: composer/e-msg-composer-hdrs.c:305
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 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:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3277,15 +3473,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:318
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Assumpte:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "IntroduОu l'assumpte del correu"
 
-#: composer/e-msg-composer.c:299
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3294,38 +3490,38 @@ msgstr ""
 "No s'ha pogut obrir el fitxer de signatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:406
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Anomena i desa..."
 
-#: composer/e-msg-composer.c:417
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error en desar el fitxer: %s"
 
-#: composer/e-msg-composer.c:437
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error en carregar el fitxer: %s"
 
-#: composer/e-msg-composer.c:459
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "S'estan desant els canvis al missatge..."
 
-#: composer/e-msg-composer.c:461
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Desa els canvis al missatge..."
 
-#: composer/e-msg-composer.c:502
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Error en desar la redacciС a 'Esborranys': %s"
 
-#: composer/e-msg-composer.c:546 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:552
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3335,27 +3531,27 @@ msgstr ""
 "\n"
 "Voleu desar-ne els canvis?"
 
-#: composer/e-msg-composer.c:574
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Obre un fitxer"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Aquest fitxer no existeix."
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Aquest fitxer no Иs habitual."
 
-#: composer/e-msg-composer.c:720
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Aquest fitxer existeix perР no es pot llegir."
 
-#: composer/e-msg-composer.c:730
+#: composer/e-msg-composer.c:923
 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:752
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3363,47 +3559,65 @@ msgstr ""
 "El fitxer Иs molt gran (mИs de 100 kB).\n"
 "Segur que voleu inserir-lo?"
 
-#: composer/e-msg-composer.c:773
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "S'ha produОt un error en llegir el fitxer."
 
-#: composer/e-msg-composer.c:1136
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Redacta un missatge"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "No s'ha pogut crear la finestra del redactor."
 
-#: filter/filter-datespec.c:61
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "No es pot inicialitzar el component de correu de l'Evolution."
+
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Cerca"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "anys"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "mesos"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "setmanes"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 msgid "days"
 msgstr "dies"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "hores"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuts"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "segons"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -3413,7 +3627,7 @@ msgstr ""
 "sigui quina sigui, en quХ s'executi el filtre\n"
 "o s'obri la vfolder."
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -3421,7 +3635,7 @@ msgstr ""
 "La data del missatge es compararЮ amb l'hora\n"
 "que indiqueu aquМ."
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3432,42 +3646,47 @@ msgstr ""
 "\"fa una setmana\", per exemple."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr "l'hora actual"
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr "una hora que indiqueu"
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr "una hora relativa a l'actual"
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr "Compara-la amb"
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<feu clic aquМ per seleccionar una data>"
 
-#: filter/filter-editor.c:159 mail/mail-autofilter.c:287
-#: mail/mail-autofilter.c:336
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Afegeix una regla de filtre"
 
-#: filter/filter-editor.c:207
+#: filter/filter-editor.c:233
 msgid "Edit Filter Rule"
 msgstr "Edita una regla de filtre"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:404 filter/filter.glade.h:7
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr "Agrupament"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Filtres d'ediciС"
 
@@ -3484,81 +3703,104 @@ msgstr "Afegeix una acciС"
 msgid "Remove action"
 msgstr "Elimina una acciС"
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Seleccioneu una carpeta"
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "IntroduОu l'URI de la carpeta"
 
-#: filter/filter-folder.c:254
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<feu clic aquМ per seleccionar una carpeta>"
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:184
+#, fuzzy, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Error en preparar-se per a %s:\n"
+"%s"
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Comprova"
 
-#: filter/filter-rule.c:509
+#: filter/filter-rule.c:520
 msgid "Rule name: "
 msgstr "Nom de la regla: "
 
-#: filter/filter-rule.c:513
+#: filter/filter-rule.c:524
 msgid "Untitled"
 msgstr "Sense tМtol"
 
-#: filter/filter-rule.c:527
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:544
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Executa les accions"
 
-#: filter/filter-rule.c:548
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "si es compleixen tots els criteris"
 
-#: filter/filter-rule.c:553
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "si es compleix qualsevol criteri"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Afegeix un criteri"
 
-#: filter/filter-rule.c:570
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Elimina un criteri"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Entrant\n"
-"Sortint\n"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Regles del filtre"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Edita"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Edita les VFolders"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "Regles del filtre"
+
+#: po/tmp/filter.glade.h:12
+#, fuzzy
+msgid "Incoming"
+msgstr ""
+"Entrant\n"
+"Sortint\n"
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "Contorn:"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Carpetes virtuals"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Fonts de la vFolder"
 
@@ -3596,118 +3838,138 @@ msgid "Message Body"
 msgstr "Cos del missatge"
 
 #: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Cos del missatge"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "S'ha rebut el missatge"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "S'ha enviat el missatge"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Mou a la carpeta"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Destinataris"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Remitent"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Estat de la connexiС"
+
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Font"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Especifiqueu la capГalera"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "_Estat:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Atura el processament"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Assumpte"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "desprИs de"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "abans de"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "contИ"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "no contИ"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "no acaba amb "
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "no existeix"
 
-#: filter/libfilter-i18n.h:27
-msgid "does not match regex"
-msgstr "no coincideix amb la regex"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "does not sound like"
+msgstr "no acaba amb "
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "no comenГa per"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "acaba amb"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "existeix"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "Иs mИs gran que"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "Иs mИs petit que"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "no Иs"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "Иs"
 
-#: filter/libfilter-i18n.h:35
-msgid "matches regex"
-msgstr "coincideix amb la regex"
-
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "el o desprИs del"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "el o abans del"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "comenГa per"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "ha estat desprИs de"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "ha estat abans de"
 
@@ -3731,81 +3993,164 @@ msgstr "Afegeix una regla de la VFolder"
 msgid "Edit VFolder Rule"
 msgstr "Edita una regla de la VFolder"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No es pot inicialitzar el component de correu de l'Evolution."
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr ""
-"No es pot inicialitzar el component de resum del correu de l'Evolution."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr ""
-"No es pot inicialitzar el hash d'emmagatzematge de correu de l'Evolution."
-
-#: mail/component-factory.c:323
-#, c-format
-msgid "Bad storage URL (no server): %s"
-msgstr "URL d'emmagatzemament incorrecte (cap servidor): %s"
-
-#: mail/component-factory.c:342
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "No es pot registrar l'emmagatzemament amb l'intХrpret d'ordres"
 
-#: mail/folder-browser.c:137
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
+msgstr "Desa"
+
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "El cos o l'assumpte contenen"
 
-#: mail/folder-browser.c:138
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "El cos contИ"
 
-#: mail/folder-browser.c:139
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "L'assumpte contИ"
 
-#: mail/folder-browser.c:140
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "El cos no contИ"
 
-#: mail/folder-browser.c:141
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "L'assumpte no contИ"
 
-#: mail/folder-browser.c:142
-msgid "Custom search"
-msgstr "Cerca personalitzada"
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr "VFolder sobre l'assumpte"
 
-#: mail/folder-browser.c:314
-msgid "Custom"
-msgstr "Personalitzat"
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr "VFolder sobre el remitent"
 
-#: mail/folder-browser.c:492
-msgid "Full Search"
-msgstr "Cerca completa"
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr "VFolder sobre els destinataris"
 
-#: mail/folder-browser.c:497
-msgid "Save"
-msgstr "Desa"
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr "Filtre sobre l'assumpte"
+
+#: mail/folder-browser.c:458
+msgid "Filter on Sender"
+msgstr "Filtre sobre el remitent"
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr "Filtre sobre els destinataris"
 
-#: mail/mail-autofilter.c:76
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+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
+#, fuzzy
+msgid "Open"
+msgstr "_Obre"
+
+#: mail/folder-browser.c:466
+#, 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
+msgid "Print"
+msgstr "Imprimeix"
+
+#: mail/folder-browser.c:469
+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
+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
+msgid "Forward"
+msgstr "Reenvia"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "VИs endavant en el temps"
+
+#: mail/folder-browser.c:474
+#, fuzzy
+msgid "Mark as Read"
+msgstr "Mar_ca'l com a llegit"
+
+#: mail/folder-browser.c:475
+#, fuzzy
+msgid "Mark as Unread"
+msgstr "Marca'l com a per _llegir"
+
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Mou a la carpeta"
+
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Copia a la carpeta"
+
+#: mail/folder-browser.c:480
+#, 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
+#, fuzzy
+msgid "Apply Filters"
+msgstr "_Aplica els filtres"
+
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Filtre sobre la llista de correu (%s)"
+
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Correu per a %s"
 
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Assumpte"
+
 #: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Correu de %s"
 
-#: mail/mail-autofilter.c:332
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "Llista de correu %s"
 
-#: mail/mail-callbacks.c:73
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3817,7 +4162,7 @@ msgstr ""
 "rebre o redactar correu.\n"
 "El voleu configurar ara?"
 
-#: mail/mail-callbacks.c:113
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -3825,7 +4170,7 @@ msgstr ""
 "Cal que configureu una identitat\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:127
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -3833,19 +4178,19 @@ msgstr ""
 "Cal que configureu un transport de correu\n"
 "abans de poder redactar correu."
 
-#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
 msgid "You have no mail sources configured"
 msgstr "No teniu configurada cap font de correu"
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:213
 msgid "You have not set a mail transport method"
 msgstr "No heu definit cap mХtode de transport de correu"
 
-#: mail/mail-callbacks.c:221
+#: mail/mail-callbacks.c:222
 msgid "You have no Outbox configured"
 msgstr "No teniu configurada cap bЗstia de sortida"
 
-#: mail/mail-callbacks.c:245
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3853,19 +4198,19 @@ msgstr ""
 "Aquest missatge no tИ cap assumpte.\n"
 "Voleu que l'enviО igualment?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:291
 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:532
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Mou el(s) missatge(s) cap a"
 
-#: mail/mail-callbacks.c:534
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Copia el(s) missatge(s) a"
 
-#: mail/mail-callbacks.c:649
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3873,7 +4218,29 @@ 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
+msgid "Overwrite file?"
+msgstr "Voleu sobreescriure el fitxer?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ja existeix una fitxer amb aquest nom.\n"
+"El voleu sobreescriure?"
+
 #: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Anomena i desa..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Anomena i desa..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3882,15 +4249,47 @@ msgstr ""
 "Error en carregar la informaciС del filtre:\n"
 "%s"
 
-#: mail/mail-callbacks.c:793 mail/message-list.c:1574
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Imprimeix el missatge"
 
-#: mail/mail-callbacks.c:840
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Ha fallat la impressiС del missatge"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr "Identitat"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "ConfiguraciС del correu"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "Font del correu"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transport de correu"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+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"
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -3900,59 +4299,63 @@ msgstr ""
 "desortida. Podeu, opcionalment, introduir el nom de la vostra organitzaciС, "
 "iel nom d'un fitxer d'on llegir la vostra signatura."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Nom complet:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "AdreГa electrРnica:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "OrganitzaciС:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Fitxer de signatura:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Fitxer de signatura"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Nom d'usuari:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "CamМ:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "AutenticaciС:"
 
-#: mail/mail-config-gui.c:941
+#: 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"
 
-#: mail/mail-config-gui.c:980
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "ParЮmetres de prova"
 
-#: mail/mail-config-gui.c:1107
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Tipus de font del correu:"
 
-#: mail/mail-config-gui.c:1112 mail/mail-config-gui.c:1160
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3966,11 +4369,11 @@ msgstr ""
 "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:1131
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "Tipus de font de notМcies:"
 
-#: mail/mail-config-gui.c:1136
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3983,186 +4386,112 @@ msgstr ""
 "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:1155
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "Tipus de transport de correu:"
 
-#: mail/mail-config-gui.c:1210
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Afegeix una identitat"
 
-#: mail/mail-config-gui.c:1212
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "Edita la identitat"
 
-#: mail/mail-config-gui.c:1310
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Afegeix una font"
 
-#: mail/mail-config-gui.c:1312
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Edita la font"
 
-#: mail/mail-config-gui.c:1407
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Afegeix un servidor de notМcies"
 
-#: mail/mail-config-gui.c:1409
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Edita el servidor de notМcies"
 
-#: mail/mail-config-gui.c:2233
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "S'estЮ comprovant \"%s\""
 
-#: mail/mail-config-gui.c:2235
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "ConnexiС de prova a \"%s\""
 
-#: mail/mail-config-gui.c:2277
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "La connexiС ha tingut Хxit!"
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Possibilitats d'autoritzaciС de consultes de \"%s\""
 
-#: mail/mail-config-gui.c:2329
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "AutoritzaciС de consultes a \"%s\""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "ConfiguraciС del correu"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Benvingut a l'assistent de configuraciС de l'Evolution!\n"
-"Faciliteu certes informacions sobre els vostres parЮmetres\n"
-"de correu electrРnic i podreu comenГar immediatament a enviar\n"
-"i rebre correu. Feu clic a SegЭent per continuar."
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Identitat"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Font del correu"
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "Transport de correu"
-
-#: mail/mail-config-druid.glade.h:17
-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"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr "Identitats"
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "AdreГa"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "OrganitzaciС"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Fonts"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr "Identitats"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Fonts del correu"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/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
 msgid "News Servers"
 msgstr "Servidors de notМcies"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Fonts de notМcies"
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "OrganitzaciС"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Envia els missatges en format HTML"
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
-msgstr "Marca el missatge com a vist [ms]: "
-
-#: mail/mail-crypto.c:137
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "No s'ha pogut crear el conducte a %s: %s"
-
-#: mail/mail-crypto.c:164
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "No es pot executar %s: %s\n"
-
-#: mail/mail-crypto.c:168
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "No es pot bifurcar %s: %s"
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Fonts"
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Si us plau, introduОu la vostra contrasenya PGP/GPG."
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "No s'ha indicat cap contrasenya."
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, 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:600
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "No hi ha cap programa GPG/PGP disponible."
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
-msgstr "Voleu sobreescriure el fitxer?"
-
-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ja existeix una fitxer amb aquest nom.\n"
-"El voleu sobreescriure?"
-
-#: mail/mail-display.c:86
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4171,73 +4500,130 @@ msgstr ""
 "No s'ha pogut obrir el fitxer %s:\n"
 "%s"
 
-#: mail/mail-display.c:98
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No s'han pogut escriure les dades: %s"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Desa l'adjunciС"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No s'ha pogut crear el directori temporal: %s"
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Desa al disc..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Obre a %s..."
 
-#: mail/mail-display.c:280
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "Visualitza en lМnia"
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Visualitzador extern"
 
-#: mail/mail-display.c:327
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Visualitza en lМnia (mitjanГant %s)"
 
-#: mail/mail-display.c:331
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Amaga"
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:500
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "adjunciС"
+
+#: mail/mail-format.c:623
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Respon"
+
+#: mail/mail-format.c:845
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+#, fuzzy
+msgid "Encrypted message not displayed"
+msgstr "Esborra la visualitzaciС del missatge"
+
+#: mail/mail-format.c:863
+#, fuzzy
+msgid "Encrypted message"
+msgstr "Edita el missatge"
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1486
+#, fuzzy, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Filtre sobre la llista de correu (%s)"
+
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "S'estЮ convertint la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Canvia la carpeta \"%s\" al format \"%s\""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "S'estЮ tancant la carpeta actual"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "S'estЮ canviant el nom de la carpeta antiga i obrint-la"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "CreaciС d'una nova carpeta"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "CРpia de missatges"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4246,7 +4632,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:443
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4254,277 +4640,310 @@ msgstr ""
 "Si ja no podeu obrir aquesta bЗstia de correu\n"
 "potser us caldrЮ reparar-la manualment."
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX no llegits)"
+#: mail/mail-local.c:781
+#, fuzzy
+msgid "Registering local folder"
+msgstr "CreaciС d'una nova carpeta"
+
+#: mail/mail-local.c:783
+#, fuzzy
+msgid "Register local folder"
+msgstr "Crea una carpeta nova"
 
-#: mail/mail-ops.c:68
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "S'estЮ recollint el correu des de %s"
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recull el correu des de %s"
 
-#: mail/mail-ops.c:110
-#, c-format
-msgid "Retrieving messages : %s"
-msgstr "S'estan recuperant els missatges : %s"
-
-#: mail/mail-ops.c:253
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "No hi ha nou correu a %s."
 
-#: mail/mail-ops.c:308
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "S'estЮ filtrant el correu sota demanda"
 
-#: mail/mail-ops.c:310
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Filtra el correu sota demanda"
 
-#: mail/mail-ops.c:441
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "S'estЮ enviant \"%s\""
 
-#: mail/mail-ops.c:446
+#: 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:449
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "Envia \"%s\""
 
-#: mail/mail-ops.c:452
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Envia un missatge sense assumpte"
 
-#: mail/mail-ops.c:623
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "S'estЮ enviant la cua"
 
-#: mail/mail-ops.c:625
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Envia la cua"
 
-#: mail/mail-ops.c:761 mail/mail-ops.c:768
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "S'estЮ afegint \"%s\""
 
-#: mail/mail-ops.c:765 mail/mail-ops.c:771
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "S'estЮ afegint un missatge sense cap assumpte"
 
-#: mail/mail-ops.c:843
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "S'estЮ esborrant \"%s\""
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Esborra \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:1001
 #, 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:906
+#: mail/mail-ops.c:1003
 #, 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:909
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mou els missatges des de \"%s\" cap a \"%s\""
 
-#: mail/mail-ops.c:911
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copia els missatges des de \"%s\" cap a \"%s\""
 
-#: mail/mail-ops.c:942
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "S'estЮ movent"
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "S'estЮ copiant"
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s missatge %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1044
+#: 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:1047
+#: 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:1078
+#: 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:1198
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1201
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Escaneja les carpetes de \"%s\""
 
-#: mail/mail-ops.c:1272 mail/subscribe-dialog.c:194
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Sense descripciС)"
 
-#: mail/mail-ops.c:1332
+#: 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:1335
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Adjunta els missatges des de \"%s\""
 
-#: mail/mail-ops.c:1438
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "S'estan reenviant els missatges \"%s\""
 
-#: mail/mail-ops.c:1443
+#: 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:1446
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Reenvia el missatge \"%s\""
 
-#: mail/mail-ops.c:1451
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Reenvia un missatge sense cap assumpte"
 
-#: mail/mail-ops.c:1488
+#: 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:1505
+#: 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:1591
+#: mail/mail-ops.c:1665
+#, 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:1593
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Carrega \"%s\""
 
-#: mail/mail-ops.c:1695
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "S'estЮ creant \"%s\""
 
-#: mail/mail-ops.c:1697
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Crea \"%s\""
 
-#: mail/mail-ops.c:1745
+#: 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:1791
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "S'estЮ sincronitzant \"%s\""
 
-#: mail/mail-ops.c:1793
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Sincronitza \"%s\""
 
-#: mail/mail-ops.c:1856
+#: 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:1859
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "S'estЮ esborrant la visualitzaciС del missatge"
 
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Visualitza l'UID del missatge \"%s\""
 
-#: mail/mail-ops.c:1865
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "Esborra la visualitzaciС del missatge"
 
-#: mail/mail-ops.c:1974
+#: 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:1977
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Obre els missatges des de \"%s\""
 
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "S'estЮ carregant la carpeta %s"
 
-#: mail/mail-ops.c:2083
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "Carrega la carpeta %s"
 
-#: mail/mail-ops.c:2150
+#: 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:2153
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Visualitza els missatges des de \"%s\""
 
-#: mail/mail-ops.c:2179
+#: 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-threads.c:299
+#: 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:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "S'estЮ recuperant el missatge %d de %d (uid \"%s\")"
+
+#: mail/mail-search-dialogue.c:104
+#, fuzzy
+msgid "Cancel"
+msgstr "Cancel╥lat"
+
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+msgid "Incomplete message written on pipe!"
+msgstr "S'ha escrit un missatge incomplet al conducte!"
+
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4533,7 +4952,7 @@ msgstr ""
 "Error en preparar-se per a %s:\n"
 "%s"
 
-#: mail/mail-threads.c:648
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4542,38 +4961,34 @@ msgstr ""
 "Error en `%s':\n"
 "%s"
 
-#: mail/mail-threads.c:701
-msgid "Incomplete message written on pipe!"
-msgstr "S'ha escrit un missatge incomplet al conducte!"
-
-#: mail/mail-threads.c:705
+#: mail/mail-threads.c:732
 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:770
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "Missatge malmИs de la cadena cursada?"
 
-#: mail/mail-threads.c:889
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "No s'ha pogut crear el quadre de diЮleg."
 
-#: mail/mail-threads.c:899
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "Consulta cancel╥lada per l'usuari."
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 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:264
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "S'estЮ examinant %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -4582,46 +4997,41 @@ msgstr ""
 "rebeu missatges duplicats."
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:290
 #, 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:328
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "S'estЮ escrivint el missatge %d de %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "S'estan desant els canvis a %s"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (missatge reenviat)"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Re: (sense assumpte)"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Missatge reenviat - %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "Missatge reenviat (sense assumpte)"
 
-#: mail/mail-tools.c:551
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "No es coneix cap protocol per obrir l'URI '%s'"
-
-#: mail/mail-tools.c:580
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4634,139 +5044,112 @@ msgstr ""
 msgid "VFolders"
 msgstr "VFolders"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 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:151 ui/evolution-mail.h:34
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Respon"
 
-#: mail/mail-view.c:151 ui/evolution-mail.h:39
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Respon al remitent d'aquest missatge"
 
-#: mail/mail-view.c:154 mail/message-list.c:1577 ui/evolution-mail.h:35
-msgid "Reply to All"
-msgstr "Respon a tots"
-
-#: mail/mail-view.c:154 ui/evolution-mail.h:38
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Respon a tots els destinataris d'aquest missatge"
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:19
-msgid "Forward"
-msgstr "Reenvia"
-
-#: mail/mail-view.c:157 ui/evolution-mail.h:20
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Reenvia aquest missatge"
 
-#: mail/mail-view.c:161 ui/evolution-addressbook.h:16
-#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
-msgid "Print"
-msgstr "Imprimeix"
-
-#: mail/mail-view.c:161 ui/evolution-mail.h:33
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Imprimeix el missatge seleccionat"
 
-#: mail/mail-view.c:163 ui/evolution-mail.h:14
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Suprimeix aquest missatge"
 
-#: mail/message-list.c:518
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "No vist"
 
-#: mail/message-list.c:521
+#: mail/message-list.c:575
 msgid "Seen"
 msgstr "Vist"
 
-#: mail/message-list.c:524
+#: mail/message-list.c:578
 msgid "Answered"
 msgstr "Respost"
 
-#: mail/message-list.c:1572
-msgid "Open in New Window"
-msgstr "Obre'l en una nova finestra"
-
-#: mail/message-list.c:1573
-msgid "Edit Message"
-msgstr "Edita el missatge"
-
-#: mail/message-list.c:1576
-msgid "Reply to Sender"
-msgstr "Respon al remitent"
-
-#: mail/message-list.c:1578
-msgid "Forward Message"
-msgstr "Reenvia el missatge"
-
-#: mail/message-list.c:1580
-msgid "Delete Message"
-msgstr "Suprimeix el missatge"
-
-#: mail/message-list.c:1581
-msgid "Move Message"
-msgstr "Mou el missatge"
-
-#: mail/message-list.c:1582
-msgid "Copy Message"
-msgstr "Copia el missatge"
-
-#: mail/message-list.c:1584
-msgid "VFolder on Subject"
-msgstr "VFolder sobre l'assumpte"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
+msgstr ""
 
-#: mail/message-list.c:1585
-msgid "VFolder on Sender"
-msgstr "VFolder sobre el remitent"
+#. 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
 
-#: mail/message-list.c:1586
-msgid "VFolder on Recipients"
-msgstr "VFolder sobre els destinataris"
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "Desconegut"
 
-#: mail/message-list.c:1588
-msgid "Filter on Subject"
-msgstr "Filtre sobre l'assumpte"
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
+msgstr "S'estЮ reconstruint la visualitzaciС del missatge"
 
-#: mail/message-list.c:1589
-msgid "Filter on Sender"
-msgstr "Filtre sobre el remitent"
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
+msgstr "Reconstrueix la visualitzaciС del missatge"
 
-#: mail/message-list.c:1590
-msgid "Filter on Recipients"
-msgstr "Filtre sobre els destinataris"
+#: mail/subscribe-dialog.c:139
+#, fuzzy
+msgid "Display folders starting with:"
+msgstr "Visualitza les carpetes que continguin:"
 
-#: mail/message-list.c:1591 mail/message-list.c:1614
-msgid "Filter on Mailing List"
-msgstr "Filtre sobre la llista de correu"
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1616
+#: mail/subscribe-dialog.c:175
 #, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtre sobre la llista de correu (%s)"
+msgid "Get store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1734
-msgid "Rebuilding message view"
-msgstr "S'estЮ reconstruint la visualitzaciС del missatge"
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "S'estan escanejant les carpetes de \"%s\""
 
-#: mail/message-list.c:1736
-msgid "Rebuild message view"
-msgstr "Reconstrueix la visualitzaciС del missatge"
+#: mail/subscribe-dialog.c:286
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:132
-msgid "Display folders containing:"
-msgstr "Visualitza les carpetes que continguin:"
+#: mail/subscribe-dialog.c:290
+#, fuzzy, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr "Escaneja les carpetes de \"%s\""
+
+#: mail/subscribe-dialog.c:293
+#, fuzzy, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr "S'estan obrint els missatges des de la carpeta \"%s\""
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Instal╥laciС de l'Evolution"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -4774,31 +5157,31 @@ msgstr ""
 "Aquesta nova versiС de l'Evolution necessita instal╥lar fitxers addicionals\n"
 "al directori personal on teniu l'Evolution"
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Si us plau, feu clic a \"D'acord\" per instal╥lar els fitxers, o a "
 "\"Cancel╥la\" per sortir."
 
-#: shell/e-setup.c:152
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr "No s'han pogut actualitzar correctament els fitxers"
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Els fitxers de l'Evolution s'han instal╥lat amb Хxit."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:187
 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:180
+#: shell/e-setup.c:188
 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:197
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4809,7 +5192,7 @@ msgstr ""
 "%s\n"
 "Error: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -4818,7 +5201,7 @@ msgstr ""
 "No es poden copiar els fitxers a\n"
 "`%s'."
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4829,7 +5212,7 @@ msgstr ""
 "Si us plau, moveu-lo per permetre la instal╥laciС\n"
 "dels fitxers d'usuari de l'Evolution."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4885,11 +5268,11 @@ msgstr "No s'ha trobat el Bug Buddy en el vostre $PATH."
 msgid "Bug buddy could not be run."
 msgstr "No es pot executar el Bug Buddy."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -4899,37 +5282,37 @@ msgstr ""
 "per a correu, agenda i gestiС de contactes\n"
 "dins de l'entorn d'escriptori GNOME."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "VИs a la carpeta..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Cap carpeta mostrada)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Carpetes"
 
-#: shell/e-shell-view.c:993
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1133
+#: shell/e-shell.c:372
 #, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "No es pot configurar l'emmagatzemament local -- %s"
+
+#: shell/e-shell.c:1208
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Ep!  La visualitzaciС de `%s' s'ha mort inesperadament.  :-(\n"
 "AixР segurament vol dir que el component %s ha petat."
 
-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "No es pot configurar l'emmagatzemament local -- %s"
-
 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
 msgstr "Crea un nou grup de dreceres"
@@ -4999,63 +5382,65 @@ msgstr "Elimina aquesta drecera de la barra de dreceres"
 msgid "Error saving shortcuts."
 msgstr "Error en desar les dreceres."
 
-#: shell/e-storage.c:127
+#: 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
+msgid "_View"
+msgstr "_Visualitza"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Visualitza la carpeta seleccionada"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Sense nom)"
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Cap error"
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Error genХric"
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Ja existeix una carpeta amb el mateix nom"
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "El tipus de carpeta especificat no Иs vЮlid"
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "Error d'E/S"
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "No hi ha espai suficient per crear la carpeta"
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "No s'ha trobat la carpeta indicada"
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "FunciС no implementada en aquest emmagatzemament"
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "PermМs denegat"
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "OperaciС no suportada"
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "El tipus indicat no es suporta en aquest emmagatzemament"
 
-#: shell/e-storage-set-view.c:223 ui/evolution.h:39
-msgid "_View"
-msgstr "_Visualitza"
-
-#: shell/e-storage-set-view.c:223
-msgid "View the selected folder"
-msgstr "Visualitza la carpeta seleccionada"
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5098,7 +5483,7 @@ msgstr ""
 "Esperem que gaudiu del resultat de la nostra feixuga feina, i esperem\n"
 "ansiosament les vostres contribucions!\n"
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5106,581 +5491,1191 @@ msgstr ""
 "GrЮcies\n"
 "L'equip de l'Evolution\n"
 
-#: shell/main.c:123
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "No es pot inicialitzat l'intХrpret d'ordres de l'Evolution."
 
-#: shell/main.c:160
+#: shell/main.c:178
+#, fuzzy
+msgid "Disable."
+msgstr "Inhabilitat"
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No es pot inicialitzar el sistema de components del Bonobo."
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "N_ou servidor de directori"
 
-#: ui/evolution-addressbook-ldap.h:10
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "_Accions"
 
-#: ui/evolution-addressbook.h:10
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Crea un nou contacte"
 
-#: ui/evolution-addressbook.h:12
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Suprimeix un contacte"
 
-#: ui/evolution-addressbook.h:13
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Cerca"
 
-#: ui/evolution-addressbook.h:14
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Cerca un contacte"
 
-#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Nou"
 
-#: ui/evolution-addressbook.h:17
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Imprimeix els contactes"
 
-#: ui/evolution-addressbook.h:18
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Atura"
 
-#: ui/evolution-addressbook.h:19
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Atura la cЮrrega"
 
-#: ui/evolution-addressbook.h:20
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Visualitza'ls tots"
 
-#: ui/evolution-addressbook.h:21
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Visualitza tots els contactes"
 
-#: ui/evolution-addressbook.h:22
-msgid "_New Contact"
-msgstr "Contacte _nou"
-
-#: ui/evolution-addressbook.h:23
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "_Imprimeix els contactes..."
 
-#: ui/evolution-addressbook.h:24
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_Cerca contactes"
 
-#: ui/evolution-addressbook.h:25
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Eines"
 
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.h:9
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 dies"
 
-#: ui/evolution-calendar.h:10
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Modifica les preferХncies"
 
-#: ui/evolution-calendar.h:11
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Agenda"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "PreferХncies de l'agenda..."
 
-#: ui/evolution-calendar.h:12
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Crea una nova cita"
 
-#: ui/evolution-calendar.h:13
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Crea una nova agenda"
 
-#: ui/evolution-calendar.h:14
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dia"
 
-#: ui/evolution-calendar.h:15
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "VИs enrera en el temps"
 
-#: ui/evolution-calendar.h:16
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "VИs endavant en el temps"
 
-#: ui/evolution-calendar.h:17
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "VИs a"
 
-#: ui/evolution-calendar.h:18
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "VИs a una data concreta"
 
-#: ui/evolution-calendar.h:19
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "VИs al present"
 
-#: ui/evolution-calendar.h:20
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.h:22
-msgid "New Ca_lendar"
-msgstr "Nova a_genda"
-
-#: ui/evolution-calendar.h:23
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "SegЭent"
 
-#: ui/evolution-calendar.h:24
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Obre una agenda"
 
-#: ui/evolution-calendar.h:25
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Anterior"
 
-#: ui/evolution-calendar.h:27
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.h:28
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Save calendar as something else"
 msgstr "Deixa l'agenda com a alguna altra cosa"
 
-#: ui/evolution-calendar.h:29
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Mostra 1 dia"
 
-#: ui/evolution-calendar.h:30
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Mostra 1 mes"
 
-#: ui/evolution-calendar.h:31
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Mostra 1 setmana"
 
-#: ui/evolution-calendar.h:32
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Mostra la setmana de treball"
 
-#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:331
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Avui"
 
-#: ui/evolution-calendar.h:34
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Setmana"
 
-#: ui/evolution-calendar.h:35 ui/evolution.h:35
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Nou"
 
-#: ui/evolution-calendar.h:36
-msgid "_New appointment..."
-msgstr "_Nova cita..."
-
-#: ui/evolution-calendar.h:37
-msgid "_Open"
-msgstr "_Obre"
-
-#: ui/evolution-calendar.h:38
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Obre una agenda"
 
-#: ui/evolution-calendar.h:39
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Imprimeix aquest agenda"
 
-#: ui/evolution-calendar.h:40
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "_Anomena i desa l'agenda"
 
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:19
-#: ui/evolution.h:29
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Suprimeix aquest element"
+
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "Suprimeix"
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+#, fuzzy
+msgid "Help"
+msgstr "_Ajuda"
+
+#: po/tmp/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
+msgid "Print this item"
+msgstr "Imprimeix aquest element"
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/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
+#, fuzzy
+msgid "Save _As..."
+msgstr "Anomena i desa..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr "Desa i tanca"
+
+#: po/tmp/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
+msgid "Se_nd contact to other..."
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/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
+#, 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
 msgid "_File"
 msgstr "_Fitxer"
 
-#: ui/evolution-contact-editor.h:10
+#: po/tmp/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
 msgid "_Save"
 msgstr "_Desa"
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "_Anomena i desa"
+#.
+#. * 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
+msgid "About this application"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "About..."
+msgstr "Lletra..."
+
+#: po/tmp/evolution-event-editor.xml.h:8
+#, fuzzy
+msgid "Actio_ns"
+msgstr "_Accions"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "Agenda"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "Personalitzat"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Clear"
+msgstr "Agenda"
+
+#: po/tmp/evolution-event-editor.xml.h:12
+#, fuzzy
+msgid "Clear the selection"
+msgstr "_Inverteix la selecciС"
+
+#: po/tmp/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
+msgid "Copy"
+msgstr "Copia"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:17
+#, fuzzy
+msgid "Cut"
+msgstr "Personalitzat"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
 
-#: ui/evolution-contact-editor.h:13
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr "FIXME: _Llibreta d'adreces..."
+
+#: po/tmp/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
+msgid "FIXME: Chec_k Names"
+msgstr "FIXME: Comp_rova els noms"
+
+#: po/tmp/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
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: D_issenya un formulari..."
+
+#: po/tmp/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
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Diss_enya aquest formulari"
+
+#: po/tmp/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
+msgid "FIXME: For_ward"
+msgstr "FIXME: Reen_via"
+
+#: po/tmp/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
+msgid "FIXME: Help"
+msgstr "FIXME: Ajuda"
+
+#: po/tmp/evolution-event-editor.xml.h:34
+#, fuzzy
+msgid "FIXME: In_complete Task"
+msgstr "FIXME: _Tasca"
+
+#: po/tmp/evolution-event-editor.xml.h:35
+#, fuzzy
+msgid "FIXME: Insert File"
+msgstr "FIXME: Insereix el fitxer..."
+
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr "FIXME: El_ement..."
+
+#: po/tmp/evolution-event-editor.xml.h:37
+#, fuzzy
+msgid "FIXME: Paste _Special... "
+msgstr "FIXME: Enganxa e_special..."
+
+#: po/tmp/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
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: Pu_blica el formulari com a..."
+
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Publica el _formulari..."
+
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr "FIXME: Rec_urrХncia..."
+
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr "FIXME: E_nvia"
+
+#: po/tmp/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
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: _Depurador de seqЭХncies"
+
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr "FIXME: _PeticiС de tasca"
+
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Contacte"
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _Personalitza..."
+
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr "FIXME: _Fitxer..."
+
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Lletra..."
+
+#: po/tmp/evolution-event-editor.xml.h:50
+#, fuzzy
+msgid "FIXME: _Formatting"
+msgstr "FIXME: S'estЮ __formatant"
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr "FIXME: _Element"
+
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: Entrada al _diari"
+
+#: po/tmp/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
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: Missatge de _correu"
+
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: Estil _memo"
+
+#: po/tmp/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
+msgid "FIXME: _New Appointment"
+msgstr "FIXME: _Nova cita"
+
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr "FIXME: _Nota"
+
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Objecte..."
+
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _ParЮgraf..."
+
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _Ortografia..."
+
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr "FIXME: E_stЮndard"
+
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr "FIXME: _Tasca"
+
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: Element per _llegir"
+
+#: po/tmp/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
+msgid "F_ormat"
+msgstr "F_ormat"
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/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
+msgid "Go to the previous item"
+msgstr "VИs a l'element anterior"
+
+#: po/tmp/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
+#, fuzzy
+msgid "N_ext"
+msgstr "SegЭent"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "Enganxa"
+
+#: po/tmp/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
+msgid "Pre_vious"
+msgstr "Ant_erior"
+
+#: po/tmp/evolution-event-editor.xml.h:78
+#, fuzzy
+msgid "Previous"
+msgstr "Ant_erior"
+
+#: po/tmp/evolution-event-editor.xml.h:79
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "Imprimeix..."
+
+#: po/tmp/evolution-event-editor.xml.h:80
+#, fuzzy
+msgid "Print Setup"
+msgstr "ConfiguraciС de la pЮgina:"
+
+#: po/tmp/evolution-event-editor.xml.h:83
+#, fuzzy
+msgid "Properties"
+msgstr "Propietats..."
+
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "RЮdio"
+
+#: po/tmp/evolution-event-editor.xml.h:85
+#, fuzzy
+msgid "Redo the undone action"
+msgstr "Elimina una acciС"
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "Respon"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "Save the current file"
+msgstr "l'hora actual"
+
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+#, fuzzy
+msgid "Search for a string"
+msgstr "_Cerca contactes"
+
+#: po/tmp/evolution-event-editor.xml.h:99
+#, fuzzy
+msgid "Select All"
+msgstr "Selecciona'ls _tots"
+
+#: po/tmp/evolution-event-editor.xml.h:100
+#, fuzzy
+msgid "Select everything"
+msgstr "Seleccioneu una carpeta"
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "_About..."
+msgstr "_Quant a l'Evolution..."
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "Tanca"
+
+#: po/tmp/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
+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
+msgid "_Edit"
+msgstr "_Edita"
+
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "Cerca..."
+
+#: po/tmp/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
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: po/tmp/evolution-event-editor.xml.h:114
+#, fuzzy
+msgid "_Insert"
+msgstr "_мndex"
+
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr "_Objecte"
+
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "Enganxa"
+
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Imprimeix"
 
-#: ui/evolution-contact-editor.h:15
-msgid "Save and Close"
-msgstr "Desa i tanca"
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "Propietats..."
 
-#: ui/evolution-contact-editor.h:16
-msgid "Save the contact and close the dialog box"
-msgstr "Desa el contacte i tanca el quadre de diЮleg"
+#: po/tmp/evolution-event-editor.xml.h:119
+#, fuzzy
+msgid "_Redo"
+msgstr "RЮdio"
 
-#: ui/evolution-contact-editor.h:17
-msgid "Print..."
-msgstr "Imprimeix..."
+#: po/tmp/evolution-event-editor.xml.h:120
+#, fuzzy
+msgid "_Replace..."
+msgstr "_Tanca..."
 
-#: ui/evolution-contact-editor.h:18
-msgid "Print this item"
-msgstr "Imprimeix aquest element"
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
+msgstr "_Barres d'eines"
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "Suprimeix aquest element"
+#: po/tmp/evolution-event-editor.xml.h:124
+#, fuzzy
+msgid "_Undo"
+msgstr "_Envia"
 
 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.h:9
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Redacta"
 
-#: ui/evolution-mail.h:10
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Redacta un nou missatge"
 
-#: ui/evolution-mail.h:11
-msgid "Copy"
-msgstr "Copia"
-
-#: ui/evolution-mail.h:12
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Copia el missatge a una nova carpeta"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "C_arpeta"
 
-#: ui/evolution-mail.h:16
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltre sobre el remitent"
 
-#: ui/evolution-mail.h:17
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtre sobre els dest_inataris"
 
-#: ui/evolution-mail.h:18
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Oblida les _contrasenyes"
 
-#: ui/evolution-mail.h:21
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Recupera el correu"
 
-#: ui/evolution-mail.h:22
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "_Filtres de correu ..."
 
-#: ui/evolution-mail.h:23
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
 msgstr "Gestiona les subscripcions..."
 
-#: ui/evolution-mail.h:24
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "Mar_ca'l com a llegit"
 
-#: ui/evolution-mail.h:25
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Marca'l com a per _llegir"
 
-#: ui/evolution-mail.h:26
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Mou"
 
-#: ui/evolution-mail.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Mou un missatge a una nova carpeta"
 
-#: ui/evolution-mail.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Previsualitza el missatge que s'ha d'imprimir"
 
-#: ui/evolution-mail.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "PrevisualitzaciС d'impressiС del missatge..."
 
-#: ui/evolution-mail.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Imprimeix el missatge a la impressora"
 
-#: ui/evolution-mail.h:32
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Imprimeix el missatge..."
 
-#: ui/evolution-mail.h:36
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Respon a _tots"
 
-#: ui/evolution-mail.h:37
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Respon al _remitent"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Selecciona'ls _tots"
 
-#: ui/evolution-mail.h:41
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "Envia el correu de la cua i recupera'n el nou"
 
-#: ui/evolution-mail.h:42
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Llista de missatges en cadena"
 
-#: ui/evolution-mail.h:43
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "VFolder sobre el remite_nt"
 
-#: ui/evolution-mail.h:44
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "VFolder sobre els destinata_ris"
 
-#: ui/evolution-mail.h:45
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "_Aplica els filtres"
 
-#: ui/evolution-mail.h:46
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "_Configura la carpeta"
 
-#: ui/evolution-mail.h:47
-msgid "_Copy to Folder"
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
 msgstr "_Copia a la carpeta"
 
-#: ui/evolution-mail.h:49
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "_Edita el missatge"
 
-#: ui/evolution-mail.h:50
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "_Esborra"
 
-#: ui/evolution-mail.h:51
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "_Filtre sobre l'assumpte"
 
-#: ui/evolution-mail.h:52
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "_Reenvia"
 
-#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Inverteix la selecciС"
 
-#: ui/evolution-mail.h:54
-msgid "_Mail Configuration..."
-msgstr "ConfiguraciС del _correu..."
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "ConfiguraciС del correu"
 
-#: ui/evolution-mail.h:55
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_Missatge"
 
-#: ui/evolution-mail.h:56
-msgid "_Move to Folder"
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
 msgstr "_Mou a la carpeta"
 
-#: ui/evolution-mail.h:57
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "_Obre'l en una nova finestra"
 
-#: ui/evolution-mail.h:58
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "_Imprimeix el missatge"
 
-#: ui/evolution-mail.h:59
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "_Anomena i desa..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Font"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "_En cadena"
 
-#: ui/evolution-mail.h:60
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Suprimeix"
+
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "_VFolder sobre l'assumpte"
 
-#: ui/evolution-mail.h:61
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "Editor de carpetes _virtuals..."
 
 #.
-#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.h:9
+#: po/tmp/evolution-message-composer.xml.h:6
+msgid "Attach"
+msgstr "Adjunta"
+
+#: po/tmp/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "Close the current file"
+msgstr "l'hora actual"
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr "HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:12
+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
+#, fuzzy
+msgid "Insert text file..."
+msgstr "_Insereix el fitxer de text... (FIXME)"
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "Obre un fitxer"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "_Anomena i desa"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "Desa a la _carpeta..."
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Desa a la _carpeta..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "Desa el missatge a una carpeta determinada"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send"
+msgstr "_Envia"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "Remitent"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "Remitent"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "Envia els missatges en format HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Envia aquest missatge"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "Envia aquest missatge"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Envia aquest missatge"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Mostra/amaga les adjuncions"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+msgid "Show _attachments"
+msgstr "Mostra les _adjuncions"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "Mostra les _adjuncions"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr "_Insereix el fitxer de text... (FIXME)"
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "_Obre..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/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"
 
-#: ui/evolution-subscribe.h:12
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Refresca la llista"
 
-#: ui/evolution-subscribe.h:13
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Refresca la llista de carpetes"
 
-#: ui/evolution-subscribe.h:14
+#: po/tmp/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"
 
-#: ui/evolution-subscribe.h:16
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Subscriu-me"
 
-#: ui/evolution-subscribe.h:17
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Cancel╥la la subscripciС"
 
-#: ui/evolution-subscribe.h:18 ui/evolution.h:28
-msgid "_Edit"
-msgstr "_Edita"
-
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.h:9
-msgid "Create a new folder"
-msgstr "Crea una carpeta nova"
-
-#: ui/evolution.h:10
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Mostra una altra carpeta"
 
-#: ui/evolution.h:11
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "S_urt"
 
-#: ui/evolution.h:12
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Barra de _dreceres de l'Evolution"
 
-#: ui/evolution.h:13
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Surt del programa"
 
-#: ui/evolution.h:14
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Per _comenГar"
 
-#: ui/evolution.h:15
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Mostra informaciС referent a l'Evolution"
 
-#: ui/evolution.h:16
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Mostra la barra de _carpetes"
 
-#: ui/evolution.h:17
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Mostra la barra de _dreceres"
 
-#: ui/evolution.h:18
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "_Envia un informe d'error"
+
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
 msgstr "Envia un informe d'error mitjanГant el Bug Buddy"
 
-#: ui/evolution.h:19
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Commuta la visualitzaciС o no de la barra de carpetes"
 
-#: ui/evolution.h:20
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commuta la visualitzaciС o no de la barra de dreceres"
 
-#: ui/evolution.h:21
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "UtilitzaciС del gestor de c_ontactes"
 
-#: ui/evolution.h:22
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "UtilitzaciС de l'_agenda"
 
-#: ui/evolution.h:23
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "UtilitzaciС del _gestor de correu"
 
-#: ui/evolution.h:24
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Quant a l'Evolution..."
 
-#: ui/evolution.h:25
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
-#: ui/evolution.h:26
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Contacte (FIXME)"
 
-#: ui/evolution.h:27
-msgid "_Create New Folder..."
-msgstr "_Crea una carpeta nova..."
-
-#: ui/evolution.h:30
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution.h:31
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_VИs a la carpeta..."
 
-#: ui/evolution.h:32
-msgid "_Help"
-msgstr "_Ajuda"
-
-#: ui/evolution.h:33
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_мndex"
 
-#: ui/evolution.h:34
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "Missatge de _correu (FIXME)"
 
-#: ui/evolution.h:36
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_ParЮmetres"
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "_Envia un informe d'error"
-
-#: ui/evolution.h:38
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Tentatiu"
@@ -5757,43 +6752,28 @@ msgstr "Hora de _finalitzaciС de la reuniС:"
 msgid "All Attendees"
 msgstr "Tots els assistents"
 
-#. 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:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
-#. 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:415
-msgid "MTWTFSS"
-msgstr "DDDDDDD"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:325
+#: widgets/misc/e-dateedit.c:408
 msgid "Now"
 msgstr "Ara"
 
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
-#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
-#: widgets/misc/e-dateedit.c:1127
+#. 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
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
-#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
-#: widgets/misc/e-dateedit.c:1130
+#. 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
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -5802,119 +6782,259 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Grup %i"
 
-#~ msgid "FIXME: _Appointment"
-#~ msgstr "FIXME: _Cita"
+#~ msgid "BLARG\n"
+#~ msgstr "BLARG\n"
 
-#~ msgid "FIXME: Meeting Re_quest"
-#~ msgstr "FIXME: Pe_ticiС de cita"
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Esteu segur que voleu\n"
+#~ "suprimir aquest contacte?"
+
+#~ msgid "window2"
+#~ msgstr "finestra2"
+
+#~ msgid "Recur on the"
+#~ msgstr "Repeteix-ho el dia"
 
-#~ msgid "FIXME: _Mail Message"
-#~ msgstr "FIXME: Missatge de _correu"
+#~ msgid "th day of the month"
+#~ msgstr "del mes"
 
-#~ msgid "FIXME: _Contact"
-#~ msgstr "FIXME: _Contacte"
+#~ msgid ""
+#~ "This appointment has custom recurrence rules that cannot be edited by "
+#~ "Evolution.\n"
+#~ "\n"
+#~ "However, the appointment will recur at the appropriate time and will be "
+#~ "displayed properly in the calendar views."
+#~ msgstr ""
+#~ "Aquesta cita tИ regles de recurrХncia personalitzades que l'Evolution no pot "
+#~ "editar.\n"
+#~ "\n"
+#~ "No obstant aixР, la cita recurrirЮ en el moment oportЗ i es visualitzarЮ "
+#~ "correctament en les vistes de l'agenda."
 
-#~ msgid "FIXME: _Task"
-#~ msgstr "FIXME: _Tasca"
+#~ msgid "Create to-do item"
+#~ msgstr "Crea un element per fer"
 
-#~ msgid "FIXME: Task _Request"
-#~ msgstr "FIXME: _PeticiС de tasca"
+#~ msgid "Edit to-do item"
+#~ msgstr "Edita un element per fer"
 
-#~ msgid "FIXME: _Journal Entry"
-#~ msgstr "FIXME: Entrada al _diari"
+#~ msgid "Summary:"
+#~ msgstr "Resum:"
 
-#~ msgid "FIXME: _Note"
-#~ msgstr "FIXME: _Nota"
+#~ msgid "Due Date:"
+#~ msgstr "Data de venciment:"
 
-#~ msgid "FIXME: Ch_oose Form..."
-#~ msgstr "FIXME: Tr_ia el formulari..."
+#~ msgid "Priority:"
+#~ msgstr "Prioritat:"
 
-#~ msgid "FIXME: _Memo Style"
-#~ msgstr "FIXME: Estil _memo"
+#~ msgid "Time display"
+#~ msgstr "VisualitzaciС de l'hora"
 
-#~ msgid "FIXME: Define Print _Styles..."
-#~ msgstr "FIXME: Defineix els e_stils d'impressiС..."
+#~ msgid "Time format"
+#~ msgstr "Format de l'hora"
 
-#~ msgid "FIXME: S_end"
-#~ msgstr "FIXME: E_nvia"
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 hores (AM/PM)"
 
-#~ msgid "Page Set_up"
-#~ msgstr "Con_figuraciС de la pЮgina"
+#~ msgid "24-hour"
+#~ msgstr "24 hores"
 
-#~ msgid "FIXME: Print Pre_view"
-#~ msgstr "FIXME: Pre_visualitzaciС de la impressiС"
+#~ msgid "Weeks start on"
+#~ msgstr "La setmana comenГa el"
 
-#~ msgid "FIXME: Paste _Special..."
-#~ msgstr "FIXME: Enganxa e_special..."
+#~ msgid "Day range"
+#~ msgstr "Abast de dies"
 
-#~ msgid "_Object"
-#~ msgstr "_Objecte"
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "Si us plau, seleccioneu les hores d'inici i\n"
+#~ "finalitzaciС que voleu que es mostrin en les\n"
+#~ "vistes de dia i de setmana. Per defecte, les\n"
+#~ "hores fora d'aquest abast no es mostraran."
 
-#~ msgid "FIXME: _Item"
-#~ msgstr "FIXME: _Element"
+#~ msgid "Day start:"
+#~ msgstr "Inici del dia:"
 
-#~ msgid "FIXME: _Unread Item"
-#~ msgstr "FIXME: Element per _llegir"
+#~ msgid "Day end:"
+#~ msgstr "Final del dia:"
 
-#~ msgid "FIXME: Fi_rst Item in Folder"
-#~ msgstr "FIXME: Pr_imer element de la carpeta"
+#~ msgid "Colors for display"
+#~ msgstr "Colors per a la visualitzaciС"
 
-#~ msgid "FIXME: _Last Item in Folder"
-#~ msgstr "FIXME: _зltim element de la carpeta"
+#~ msgid "Show on TODO List:"
+#~ msgstr "Mostra-ho a la llista de coses per fer:"
 
-#~ msgid "FIXME: _Standard"
-#~ msgstr "FIXME: E_stЮndard"
+#~ msgid "To Do List style options:"
+#~ msgstr "Opcions d'estil de la llista de coses per fer:"
 
-#~ msgid "FIXME: __Formatting"
-#~ msgstr "FIXME: S'estЮ __formatant"
+#~ msgid "Highlight overdue items"
+#~ msgstr "Ressalta els elements endarrerits"
 
-#~ msgid "FIXME: _Customize..."
-#~ msgstr "FIXME: _Personalitza..."
+#~ msgid "Highlight not yet due items"
+#~ msgstr "Ressalta els elements que encara no han venГut"
 
-#~ msgid "Pre_vious"
-#~ msgstr "Ant_erior"
+#~ msgid "Highlight items due today"
+#~ msgstr "Ressalta els elemts que vencen avui"
 
-#~ msgid "Ne_xt"
-#~ msgstr "Se_gЭent"
+#~ msgid "To Do List"
+#~ msgstr "Llista de coses per fer"
+
+#~ msgid "Preferences"
+#~ msgstr "PreferХncies"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmes"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "Propietats de l'alarma"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "Fes un so en visualitzar les alarmes"
+
+#~ msgid "Audio alarms timeout after"
+#~ msgstr "Les alarmes acЗstiques s'apaguen desprИs de"
+
+#~ msgid " seconds"
+#~ msgstr " segons"
+
+#~ msgid "Enable snoozing for "
+#~ msgstr "Habilita l'snoozing per a "
 
-#~ msgid "_Toolbars"
-#~ msgstr "_Barres d'eines"
+#~ msgid "Could not connect to IMAP server on %s."
+#~ msgstr "No s'ha pogut connectar al servidor IMAP en %s."
 
-#~ msgid "FIXME: _File..."
-#~ msgstr "FIXME: _Fitxer..."
+#~ msgid "Could not create summary"
+#~ msgstr "No s'ha pogut crear el resum"
 
-#~ msgid "FIXME: It_em..."
-#~ msgstr "FIXME: El_ement..."
+#~ msgid "Cannot get message: %s"
+#~ msgstr "No es pot recuperar el missatge: %s"
 
-#~ msgid "FIXME: _Object..."
-#~ msgstr "FIXME: _Objecte..."
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Per llegir el correu lliurat al sistema local i per emmagatzemar correu en "
+#~ "el disc local."
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr ""
+#~ "No s'ha pogut canviar el nom de la carpeta %s a %s: el nom de destМ ja "
+#~ "existeix"
 
-#~ msgid "FIXME: _Font..."
-#~ msgstr "FIXME: _Lletra..."
+#~ msgid "Could not open summary %s"
+#~ msgstr "No s'ha pogut obrir el resum %s"
 
-#~ msgid "FIXME: _Paragraph..."
-#~ msgstr "FIXME: _ParЮgraf..."
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "IncongruХncia del resum, manca la capГalera de l'X-Evolution"
 
-#~ msgid "FIXME: Desi_gn This Form"
-#~ msgstr "FIXME: Diss_enya aquest formulari"
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "No es poden copiar les dades al fitxer de sortida: %s"
 
-#~ msgid "FIXME: D_esign a Form..."
-#~ msgstr "FIXME: D_issenya un formulari..."
+#~ msgid "Could not load or create summary"
+#~ msgstr "No s'ha pogut carregar o crear el resum"
 
-#~ msgid "FIXME: Publish _Form..."
-#~ msgstr "FIXME: Publica el _formulari..."
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "No s'ha pogut canviar el nom de la carpeta `%s': %s existeix"
 
-#~ msgid "FIXME: Pu_blish Form As..."
-#~ msgstr "FIXME: Pu_blica el formulari com a..."
+#~ msgid "MH folders may not be nested."
+#~ msgstr "Les carpetes MH no es poden imbricar."
 
-#~ msgid "FIXME: Script _Debugger"
-#~ msgstr "FIXME: _Depurador de seqЭХncies"
+#~ msgid "does not match regex"
+#~ msgstr "no coincideix amb la regex"
 
-#~ msgid "FIXME: _Spelling..."
-#~ msgstr "FIXME: _Ortografia..."
+#~ 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."
 
-#~ msgid "_Forms"
-#~ msgstr "_Formularis"
+#~ msgid "Bad storage URL (no server): %s"
+#~ msgstr "URL d'emmagatzemament incorrecte (cap servidor): %s"
+
+#~ msgid "Custom search"
+#~ msgstr "Cerca personalitzada"
+
+#~ msgid "Full Search"
+#~ msgstr "Cerca completa"
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail configuration wizard!\n"
+#~ "By filling in some information about your email\n"
+#~ "settings, you can start sending and receiving email\n"
+#~ "right away. Click Next to continue."
+#~ msgstr ""
+#~ "Benvingut a l'assistent de configuraciС de l'Evolution!\n"
+#~ "Faciliteu certes informacions sobre els vostres parЮmetres\n"
+#~ "de correu electrРnic i podreu comenГar immediatament a enviar\n"
+#~ "i rebre correu. Feu clic a SegЭent per continuar."
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "No s'ha pogut crear el conducte a %s: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "No es pot executar %s: %s\n"
+
+#~ 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'"
+
+#~ msgid "Open in New Window"
+#~ msgstr "Obre'l en una nova finestra"
+
+#~ 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..."
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "FIXME: _Cita"
+
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "FIXME: Pe_ticiС de cita"
+
+#~ msgid "Page Set_up"
+#~ msgstr "Con_figuraciС de la pЮgina"
+
+#~ msgid "Ne_xt"
+#~ msgstr "Se_gЭent"
 
 #~ msgid "FIXME: _New Contact"
 #~ msgstr "FIXME: Contacte _nou"
@@ -5925,9 +7045,6 @@ msgstr "Grup %i"
 #~ msgid "FIXME: New _Letter to Contact"
 #~ msgstr "FIXME: Nova _carta per contactar"
 
-#~ msgid "FIXME: New _Message to Contact"
-#~ msgstr "FIXME: Nou _missatge per contactar"
-
 #~ msgid "FIXME: New Meetin_g with Contact"
 #~ msgstr "FIXME: Nova cit_a amb contacte"
 
@@ -5952,36 +7069,15 @@ msgstr "Grup %i"
 #~ msgid "FIXME: Forward as _vCard"
 #~ msgstr "FIXME: Reenvia com a _vCard"
 
-#~ msgid "FIXME: For_ward"
-#~ msgstr "FIXME: Reen_via"
-
-#~ msgid "F_ormat"
-#~ msgstr "F_ormat"
-
-#~ msgid "FIXME: Insert File..."
-#~ msgstr "FIXME: Insereix el fitxer..."
-
 #~ msgid "Insert a file as an attachment"
 #~ msgstr "Insereix un fitxer com a adjunciС"
 
 #~ msgid "FIXME: Previous"
 #~ msgstr "FIXME: Anterior"
 
-#~ msgid "Go to the previous item"
-#~ msgstr "VИs a l'element anterior"
-
 #~ msgid "FIXME: Next"
 #~ msgstr "FIXME: SegЭent"
 
-#~ msgid "Go to the next item"
-#~ msgstr "VИs a l'element segЭent"
-
-#~ msgid "FIXME: Help"
-#~ msgstr "FIXME: Ajuda"
-
-#~ msgid "See online help"
-#~ msgstr "Consulta l'ajuda en lМnia"
-
 #~ msgid "Gnome Calendar"
 #~ msgstr "Agenda del Gnome"
 
@@ -6018,36 +7114,18 @@ msgstr "Grup %i"
 #~ msgid "FIXME: Ca_lendar..."
 #~ msgstr "FIXME: A_genda..."
 
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "FIXME: Comp_rova els noms"
-
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "FIXME: _Llibreta d'adreces..."
-
-#~ msgid "FIXME: _New Appointment"
-#~ msgstr "FIXME: _Nova cita"
-
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "FIXME: Rec_urrХncia..."
-
 #~ msgid "FIXME: Invite _Attendees..."
 #~ msgstr "FIXME: Invita els _assistents..."
 
 #~ msgid "FIXME: C_ancel Invitation..."
 #~ msgstr "FIXME: C_ancel╥la una invitaciС..."
 
-#~ msgid "FIXME: Forward as v_Calendar"
-#~ msgstr "FIXME: Reenvia com a v_Calendar"
-
 #~ msgid "FIXME: Save and Close"
 #~ msgstr "FIXME: Desa i tanca"
 
 #~ msgid "FIXME: Print..."
 #~ msgstr "FIXME: Imprimeix..."
 
-#~ msgid "FIXME: Invite Attendees..."
-#~ msgstr "FIXME: Invita els assistents..."
-
 #~ msgid "Invite attendees to a meeting"
 #~ msgstr "Invita als assistents a una reuniС"
 
@@ -6063,9 +7141,6 @@ msgstr "Grup %i"
 #~ msgid "To-do list"
 #~ msgstr "Llista de coses per fer"
 
-#~ msgid "Add..."
-#~ msgstr "Afegeix..."
-
 #~ msgid "Edit..."
 #~ msgstr "Edita..."
 
@@ -6102,21 +7177,12 @@ msgstr "Grup %i"
 #~ msgid "Copy selected item into clipboard"
 #~ msgstr "Copia l'element seleccionat al porta-retalls"
 
-#~ msgid "Paste"
-#~ msgstr "Enganxa"
-
-#~ msgid "Paste item from clipboard"
-#~ msgstr "Enganxa l'element del porta-retalls"
-
 #~ msgid "Select recipients' addresses"
 #~ msgstr "Selecciona les adreces dels destinataris"
 
 #~ msgid "Name"
 #~ msgstr "Nom"
 
-#~ msgid "Properties..."
-#~ msgstr "Propietats..."
-
 #~ msgid "To: >>"
 #~ msgstr "Per a: >>"
 
@@ -6141,54 +7207,15 @@ msgstr "Grup %i"
 #~ msgid "Load a previously saved message"
 #~ msgstr "Carrega un missatge desat anteriorment"
 
-#~ msgid "_Save as..."
-#~ msgstr "_Anomena i desa..."
-
-#~ msgid "Save in _folder..."
-#~ msgstr "Desa a la _carpeta..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Desa el missatge a una carpeta determinada"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Insereix el fitxer de text... (FIXME)"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Insereix un fitxer com a text dins del missatge"
-
-#~ msgid "_Send"
-#~ msgstr "_Envia"
-
-#~ msgid "_Close..."
-#~ msgstr "_Tanca..."
-
 #~ msgid "_Format"
 #~ msgstr "_Formata"
 
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Mostra les _adjuncions"
-
-#~ msgid "Show/hide attachments"
-#~ msgstr "Mostra/amaga les adjuncions"
-
-#~ msgid "Send this message"
-#~ msgstr "Envia aquest missatge"
-
-#~ msgid "Attach"
-#~ msgstr "Adjunta"
-
 #~ msgid "Check for new mail"
 #~ msgstr "Comprova si hi ha nou correu"
 
 #~ msgid "Currently pending operations:"
 #~ msgstr "Operacions encara pendents:"
 
-#~ msgid "Online Status"
-#~ msgstr "Estat de la connexiС"
-
 #~ msgid "To"
 #~ msgstr "Per a"
 
@@ -6210,9 +7237,6 @@ msgstr "Grup %i"
 #~ msgid "Fields"
 #~ msgstr "Camps"
 
-#~ msgid "Grouping"
-#~ msgstr "Agrupament"
-
 #~ msgid "Field Chooser"
 #~ msgstr "Selector de camps"
 
diff --git a/po/da.po b/po/da.po
index d82269e509..d4964c7ed9 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution beta\n"
-"POT-Creation-Date: 2000-10-27 17:05+0200\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-12-09 00:38+0100\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -472,97 +472,13 @@ msgstr "Punkter tilhЬrer disse kategorier:"
 msgid "Available Categories:"
 msgstr "TilgФngelige kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr "SekretФr"
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "Arbejde"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "Arbejde 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr "Firma fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr "Tilbagering"
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "Bil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "Hjem"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "Hjem 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr "Hjemme fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "Isdn"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-msgid "Mobile"
-msgstr "_Mobil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-msgid "Other"
-msgstr "Andet"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "Anden fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr "Kalder"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr "PrimФr epost"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "PrimФr epost"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "SekundФr epost"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "TertiФr epost"
+#.
+#. * 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
+msgid "Delete Contact?"
+msgstr "Slet kontakt?"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -574,7 +490,7 @@ msgid "_Add"
 msgstr "_TilfЬj"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Slet"
 
@@ -587,7 +503,13 @@ 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
 msgid "Add"
 msgstr "TilfЬj"
 
@@ -627,6 +549,11 @@ msgstr "_Fax pЕ arbejde"
 msgid "_Mobile"
 msgstr "_Mobil"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "PrimФr epost"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "A_rbejde"
@@ -640,6 +567,7 @@ msgid "C_ontacts..."
 msgstr "K_ontakter..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegorier..."
 
@@ -656,6 +584,7 @@ msgid "_Address..."
 msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Generel"
 
@@ -700,9 +629,146 @@ msgid "No_tes:"
 msgstr "_Notater:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detaljer"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "SekretФr"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Arbejde"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Arbejde 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Firma fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Tilbagering"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Bil"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Hjem"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Hjem 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Hjemme fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "Isdn"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Andet"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Anden fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Kalder"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "PrimФr epost"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "SekundФr epost"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "TertiФr epost"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "Adresse _2:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Canada"
+
+#: po/tmp/fulladdr.glade.h:8
+msgid "Check Address"
+msgstr "Tjek adresse"
+
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "_Land:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Finland"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "USA"
+
+#: po/tmp/fulladdr.glade.h:12
+msgid "_Address:"
+msgstr "_Adresse:"
+
+#: po/tmp/fulladdr.glade.h:13
+msgid "_City:"
+msgstr "_By:"
+
+#: po/tmp/fulladdr.glade.h:14
+msgid "_PO Box:"
+msgstr "_Postboks:"
+
+#: po/tmp/fulladdr.glade.h:15
+msgid "_State/Province:"
+msgstr "_Stat/Provins:"
+
+#: po/tmp/fulladdr.glade.h:16
+msgid "_ZIP Code:"
+msgstr "_ZIP/Postnummer:"
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -766,7 +832,12 @@ msgstr "_Suffiks:"
 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
 msgid "As _Table"
 msgstr "Som _tabel"
 
@@ -822,6 +893,168 @@ msgstr "Uri'en som mappebladreren vil vise"
 msgid "External Directories"
 msgstr "Eksterne kataloger"
 
+#.
+#. * 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:"
+
+#: po/tmp/ldap-server-dialog.glade.h:7
+msgid "LDAP Server:"
+msgstr "LDAP-tjener:"
+
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "Navn:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr "Portnummer:"
+
+#: po/tmp/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr "Rod 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
+msgid "Find..."
+msgstr "Find..."
+
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "Modtagerliste:"
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "VФlg mappe"
+
+#: po/tmp/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr "VФlg navn fra liste:"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "SЬg..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/alphabet.glade.h:6
+msgid "123"
+msgstr "123"
+
+#: po/tmp/alphabet.glade.h:7
+msgid "a"
+msgstr "a"
+
+#: po/tmp/alphabet.glade.h:8
+msgid "b"
+msgstr "b"
+
+#: po/tmp/alphabet.glade.h:9
+msgid "c"
+msgstr "c"
+
+#: po/tmp/alphabet.glade.h:10
+msgid "d"
+msgstr "d"
+
+#: po/tmp/alphabet.glade.h:11
+msgid "e"
+msgstr "e"
+
+#: po/tmp/alphabet.glade.h:12
+msgid "f"
+msgstr "f"
+
+#: po/tmp/alphabet.glade.h:13
+msgid "g"
+msgstr "g"
+
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+msgid "h"
+msgstr "h"
+
+#: po/tmp/alphabet.glade.h:15
+msgid "i"
+msgstr "i"
+
+#: po/tmp/alphabet.glade.h:16
+msgid "j"
+msgstr "j"
+
+#: po/tmp/alphabet.glade.h:17
+msgid "k"
+msgstr "k"
+
+#: po/tmp/alphabet.glade.h:18
+msgid "l"
+msgstr "l"
+
+#: po/tmp/alphabet.glade.h:19
+msgid "m"
+msgstr "m"
+
+#: po/tmp/alphabet.glade.h:20
+msgid "n"
+msgstr "n"
+
+#: po/tmp/alphabet.glade.h:21
+msgid "o"
+msgstr "o"
+
+#: po/tmp/alphabet.glade.h:22
+msgid "p"
+msgstr "p"
+
+#: po/tmp/alphabet.glade.h:23
+msgid "q"
+msgstr "q"
+
+#: po/tmp/alphabet.glade.h:24
+msgid "r"
+msgstr "r"
+
+#: po/tmp/alphabet.glade.h:25
+msgid "s"
+msgstr "s"
+
+#: po/tmp/alphabet.glade.h:26
+msgid "t"
+msgstr "t"
+
+#: po/tmp/alphabet.glade.h:27
+msgid "u"
+msgstr "u"
+
+#: po/tmp/alphabet.glade.h:28
+msgid "v"
+msgstr "v"
+
+#: po/tmp/alphabet.glade.h:29
+msgid "w"
+msgstr "w"
+
+#: po/tmp/alphabet.glade.h:30
+msgid "x"
+msgstr "x"
+
+#: po/tmp/alphabet.glade.h:31
+msgid "y"
+msgstr "y"
+
+#: po/tmp/alphabet.glade.h:32
+msgid "z"
+msgstr "z"
+
 #: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
@@ -845,27 +1078,191 @@ msgstr ""
 "\n"
 "Dobbelt-klik her for at oprette en ny kontakt."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "SЬg..."
+#.
+#. * 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
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
+
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
+
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "Blanke skemaer ved slutningen:"
+
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Krop"
+
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Bund:"
+
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Dimensioner:"
+
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Skrifttype..."
+
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "Skrifttyper"
+
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "Bundtekst:"
+
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Format"
+
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "Toptekst"
+
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "Top-/bundtekst"
+
+#: po/tmp/e-contact-print.glade.h:18
+msgid "Headings"
+msgstr "Overskrifter"
+
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "Toptekst for hvert bogstav"
+
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "HЬjde:"
+
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr "Lige efter hinanden"
+
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "InkludИr:"
+
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Landskab"
+
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Venstre:"
+
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "Bogstavfaner pЕ siden"
+
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Marginer"
+
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "Antal kolonner:"
+
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Alternativer"
+
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Orientering"
+
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Side"
+
+#: po/tmp/e-contact-print.glade.h:31
+#, fuzzy
+msgid "Page Setup:"
+msgstr "Side_opsФtning"
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Papir"
+
+#: po/tmp/e-contact-print.glade.h:33
+msgid "Paper source:"
+msgstr "Papirkilde:"
+
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "PortrФt"
+
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "Smugkig:"
+
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "Udskriv med grЕtoner"
+
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "Modsat pЕ lige sider"
+
+#: po/tmp/e-contact-print.glade.h:38
+msgid "Right:"
+msgstr "HЬjre:"
+
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "Sektioner:"
+
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "SkyggelФgning"
+
+#: po/tmp/e-contact-print.glade.h:41
+msgid "Size:"
+msgstr "StЬrrelse:"
+
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "Start pЕ en ny side"
+
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Stilnavn:"
+
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Top:"
+
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Type:"
+
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Bredde:"
+
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "etiket26"
 
 #. 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:539
+#: 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:542
+#: 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/cal-util/timeutil.c:100
-msgid "h"
-msgstr "h"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution kalender-komponent"
@@ -968,15 +1365,15 @@ 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:344
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Of_fentlig"
 
-#: calendar/gui/calendar-model.c:347
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:350
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "_Fortrolig"
 
@@ -1082,29 +1479,381 @@ msgstr "Besked om din aftale pЕ %A %d %b %Y %H:%M"
 msgid "No summary available."
 msgstr "Intet sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:656
+#.
+#. * 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
+msgid "Close"
+msgstr "Luk"
+
+#: po/tmp/alarm-notify.glade.h:7
+msgid "Edit appointment"
+msgstr "RedigИr aftale"
+
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "UdsФt"
+
+#: po/tmp/alarm-notify.glade.h:9
+msgid "Snooze time (minutes)"
+msgstr "UdsФt-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
+msgid "05 minutes"
+msgstr "05 minutter"
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 minutter"
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 timer (AM/PM)"
+
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 minutter"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 timer"
+
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 minutter"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 minutter"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr "Alarmer afbrydes efter"
+
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "Lyd-alarmer"
+
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr "Pip nЕr alarmvinduet kommer til syne."
+
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Kalender"
+
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "OpsФtning af kalender"
+
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Farver"
+
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr "Sammenpres weekender"
+
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr "Alternativer for datonavigator"
+
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "Forvalg"
+
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
+msgstr "Vis valgmuligheder"
+
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "FФrdig-dato"
+
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr "SlЕ udsФttelse til for"
+
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Dagen slutter:"
+
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "Ugens fЬrste dag:"
+
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "fre"
+
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "fredag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr "FremhФv:"
+
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr "Punkter som skal afsluttes idag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr "Punkter som skal afsluttes idag:"
+
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr "Punkter som ikke skal afsluttes endnu"
+
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
+msgstr "Punkter som ikke skal afsluttes endnu:"
+
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "man"
+
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "mandag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr "Overskredne opgaver"
+
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr "Overskredne opgaver:"
+
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "VФlg en farve"
+
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "Prioritet"
+
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr "PЕmind mig om alle aftaler"
+
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr "PЕmindelser"
+
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "lЬr"
+
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "lЬrdag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr "Vis"
+
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr "Vis sluttider for aftaler"
+
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "Vis ugenumre"
+
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "Dagens starter:"
+
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "sЬn"
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "sЬndag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
+msgid "TaskPad"
+msgstr "Opgaveblok"
+
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "tor"
+
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "torsdag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr "Tid til afslutning"
+
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr "Tidsopdeling:"
+
+#: po/tmp/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
+msgid "Tue"
+msgstr "tir"
+
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "tirsdag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
+msgstr "Visuelle alarmer"
+
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "ons"
+
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "onsdag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "Arbejdsuge"
+
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr "minutter fЬr de skal ske."
+
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
+msgstr "sekunder."
+
+#.
+#. * 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
+msgid "% Comp_lete:"
+msgstr "% fФrdi_g:"
+
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "_Klassificering"
+
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "Afbrudt"
+
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
+msgstr "FuldfЬrt"
+
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "FuldfЬrt dato:"
+
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
+msgstr "HЬj"
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "Under udarbejdelse"
+
+#: po/tmp/task-editor-dialog.glade.h:16
+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
+#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
+#: widgets/misc/e-dateedit.c:1446
+msgid "None"
+msgstr "Ingen"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Normal"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Ikke startet"
+
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr "_Sammendrag"
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr "Sta_rt dato:"
+
+#: po/tmp/task-editor-dialog.glade.h:24
+msgid "Task"
+msgstr "Opgave"
+
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
+msgstr "URL:"
+
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "_Kontakter..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr "Slut-_dato:"
+
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "_Prioritet:"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "_Status:"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr "task-editor-dialog"
+
+#: calendar/gui/dialogs/task-editor.c:681
 msgid "Edit Task"
 msgstr "RedigИr opgave"
 
-#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:321
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:327
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:330
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:333
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalpunkt - %s"
 
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "еbn..."
@@ -1123,6 +1872,9 @@ msgstr "MarkИr opgaven som fuldfЬrt"
 
 #: 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 "Slet"
 
@@ -1137,49 +1889,50 @@ msgstr "%02i minutters opdeling"
 
 #. 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:1197
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1211
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1224
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2932 calendar/gui/e-day-view.c:2939
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-week-view.c:3165
+#: 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
 msgid "New appointment..."
 msgstr "Ny aftale..."
 
-#: calendar/gui/e-day-view.c:2936 calendar/gui/e-day-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "RedigИr denne aftale..."
 
-#: calendar/gui/e-day-view.c:2937 calendar/gui/e-week-view.c:3170
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Slet denne aftale"
 
-#: calendar/gui/e-day-view.c:2944 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "GЬr denne aftale flytbar"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Slet denne opfЬring"
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Slet alle opfЬringer"
 
@@ -1190,64 +1943,196 @@ msgstr "Slet alle opfЬringer"
 msgid "%d %B"
 msgstr "%d %b"
 
-#: calendar/gui/event-editor.c:315
-msgid "Edit Appointment"
-msgstr "RedigИr aftale"
+#.
+#. * 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
+msgid "A_ll day event"
+msgstr "Varer he_le dagen"
 
-#: calendar/gui/event-editor.c:392
-msgid "on"
-msgstr "pЕ"
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "GrundlФggende om aftaler"
 
-#: calendar/gui/event-editor.c:417 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "Klassificering"
 
-#: calendar/gui/event-editor.c:418
-msgid "Monday"
-msgstr "mandag"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "Egendefineret genindtrФffelse"
 
-#: calendar/gui/event-editor.c:419
-msgid "Tuesday"
-msgstr "tirsdag"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Dage"
 
-#: calendar/gui/event-editor.c:420
-msgid "Wednesday"
-msgstr "onsdag"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Hver"
 
-#: calendar/gui/event-editor.c:421
-msgid "Thursday"
-msgstr "torsdag"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Undtagelser"
 
-#: calendar/gui/event-editor.c:422
-msgid "Friday"
-msgstr "fredag"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "Timer"
 
-#: calendar/gui/event-editor.c:423
-msgid "Saturday"
-msgstr "lЬrdag"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Send _til:"
 
-#: calendar/gui/event-editor.c:424
-msgid "Sunday"
-msgstr "sЬndag"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minutter"
+
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "фndr"
+
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Ingen genindtrФffelse"
+
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
+msgstr "Smugkig"
+
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Pri_vat"
+
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "Of_fentlig"
+
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "Gentagelse"
+
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr "Regel for genindtrФffelse"
+
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr "PЕmindelse"
 
-#: calendar/gui/event-editor.c:542
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr "Simpel genindtrФffelse"
+
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr "Sa_mmendrag:"
+
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Tid"
+
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "_Lyd"
+
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "_Fortrolig"
+
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr "_Vis"
+
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "S_lut-tid:"
+
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "_E-post"
+
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Program"
+
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "KЬ_r program:"
+
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "_Start-tid:"
+
+#: po/tmp/event-editor-dialog.glade.h:38
+msgid "_Starting date:"
+msgstr "_Start dato:"
+
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "dag(e)"
+
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "event-editor-dialog"
+
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
+msgstr "for"
+
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr "for evigt"
+
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "etiket21"
+
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "mЕned(er)"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "til"
+
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
+msgstr "uge(r)"
+
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "year(s)"
+msgstr "Еr"
+
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "RedigИr aftale"
+
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "pЕ"
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/event-editor.c:559
 msgid "on the"
 msgstr "den"
 
-#: calendar/gui/event-editor.c:549
+#: calendar/gui/event-editor.c:566
 msgid "th"
 msgstr "."
 
-#: calendar/gui/event-editor.c:703
+#: calendar/gui/event-editor.c:722
 msgid "occurrences"
 msgstr "hФndelser"
 
-#: calendar/gui/event-editor.c:820
+#: calendar/gui/event-editor.c:839
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Denne aftale indeholder gentagelser som Evolution ikke kan redigere."
 
-#: calendar/gui/event-editor.c:2951 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %d %b %Y"
@@ -1482,45 +2367,12 @@ msgstr "Kunne ikke oprette en kalender i '%s'"
 msgid "The method required to load `%s' is not supported"
 msgstr "Metoden der krФves for at indlФse '%s' er ikke understЬttet"
 
-#: calendar/gui/gnome-cal.c:1466
-msgid "Snooze"
-msgstr "UdsФt"
-
 #. 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"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "sЬn"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "man"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "tir"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "ons"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "tor"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "fre"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "lЬr"
-
 #: calendar/gui/goto.c:82
 msgid "Year:"
 msgstr "еr:"
@@ -1732,7 +2584,7 @@ msgstr "Dette Еr (%Y)"
 msgid "Print Calendar"
 msgstr "Udskriv kalender"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:957
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "ForhЕndsvisning af udskrift"
 
@@ -1909,6 +2761,19 @@ msgstr "URL-streng `%s' indeholder en ugyldig protokol"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer i URL `%s' er ikke-numerisk"
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kunne ikke fЕ fat pЕ Kerberos billet:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr "Forkert autoriseringsbesked fra server."
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -1942,7 +2807,7 @@ msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indlФse sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:585
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedskrop i FETCH-svar."
 
@@ -1998,57 +2863,193 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "Kunne ikke oprette sammendrag"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "UNIX e-postkataloger i MH-format (CamelLocal version)"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "For gemning af lokal e-post i MH-lignende beskedskataloger "
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX e-post filer i mbox-format (CamelLocal version)"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr "For gemning af lokal e-post i standard mbox format"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr "UNIX e-post filer i qmail maildir-format (CamelLocal version)"
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr "For gemning af lokal e-post i qmail beskedskataloger"
+
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr "Gemme-rod %s er ikke en absolut sti"
+
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "Gemme-rod %s er ikke et almindeligt katalog"
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Kan ikke fЕ fat pЕ mappe: %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr "Lokale gemmesteder har ikke en rod-mappe"
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr "Lokale gemmesteder har ikke en standard-mappe"
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr "Lokale mapper kan ikke vФre underopdelte."
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Kan ikke tilfЬje besked i mbox-filen: %s"
+msgid "Local mail file %s"
+msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-store.c:256
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Kan ikke hente besked: %s"
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Kunne ikke Фndre navn pЕ mappe %s til %s: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:34
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX e-post filer i mbox-format"
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Kunne ikke slette oversigtsfil `%s': %s"
 
-#: camel/providers/local/camel-mbox-provider.c:36
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Kunne ikke slette indeksfil `%s': %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "Kan ikke tilfЬje besked i maildir-mappe: %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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"For lФsning af e-post leveret af det lokale system, og for gemning af e-post "
-"pЕ lokal disk."
+"Kan ikke hente besked: %s\n"
+"  %s"
 
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+msgid "No such message"
+msgstr "Ingen sЕdan besked"
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
+msgstr "Ugyldigt indhold af meddelelse"
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Kunne ikke Еbne fil `%s':\n"
+"Kan ikke Еbne mappe `%s':\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mbox-store.c:108
 #: camel/providers/local/camel-mh-store.c:103
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Kunne ikke oprette mappe `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' er ikke et maildir katalog."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Kunne ikke slette mappe `%s': %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "ikke et maildir katalog"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Kan ikke Еbne postboks: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Kan ikke tilfЬje besked i mbox-filen: %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
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "Mappen set ud til at vФre uigenkaldeligt Ьdelagt."
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "Fremstilling af besked mislykkedes: Er postkassen Ьdelagt?"
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Kunne ikke Еbne fil `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2059,16 +3060,12 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:126
 #: camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' er ikke en almindelig fil."
 
 #: camel/providers/local/camel-mbox-store.c:145
 #: camel/providers/local/camel-mbox-store.c:168
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2078,175 +3075,85 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen `%s' er ikke tom. Ikke slettet."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
+#: camel/providers/local/camel-mbox-summary.c:234
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Kunne ikke Фndre navn pЕ mappe %s til %s: mЕlet eksisterer"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Kunne ikke Еbne mappe: %s: summerer fra position %ld: %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox-mapper kan ikke vФre rekursive."
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "Uoprettelig fejl ved fortolkning af post nФr position %ld i mappe %s"
 
-#: camel/providers/local/camel-local-store.c:200
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:341
 #, c-format
-msgid "Local mail file %s"
-msgstr "Lokal e-post-fil %s"
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Kan ikke lave oversigt over folder: %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
 #, c-format
-msgid "Could not open summary %s"
-msgstr "Kunne ikke Еbne sammendrag %s"
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Kunne ikke Еbne folder der skal laves oversigt for: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:491
-#: camel/providers/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke Еbne midlertidig postboks: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
-msgstr "Fejl i sammendrag, afbryder synkronisering"
-
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Fejl i sammendrag, X-Evolution toptekst mangler"
+#: 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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Oversigt og mappe uoverensstemmelse, selv efter synkronisering"
 
 #: camel/providers/local/camel-mbox-summary.c:562
-#: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fejl under skriving til midlertidig postboks: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Kan ikke kopiere data til udfil: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Fejl under skriving til midlertidig postboks: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:595
 #: camel/providers/local/camel-mbox-summary.c:748
-#: camel/providers/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:604
-#: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:615
-#: camel/providers/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke Фndre navn pЕ mappe: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:817
-#: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukendt fejl: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "Kunne ikke indlФse eller oprette sammendrag"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
-msgstr "Kan ikke tilfЬje besked i mh-mappe: %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-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Kan ikke hente besked: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "UNIX e-postkataloger i MH-format"
-
-#: camel/providers/local/camel-local-provider.c:37
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "For gemning af lokal e-post i MH-lignende beskedskataloger "
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikke Еbne mappe `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke oprette mappe `%s':\n"
-"%s"
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Kan ikke tilfЬje besked i mh-mappe: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:116
-#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' er ikke et katalog."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Kunne ikke slette mappe `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Kunne ikke Фndre navn pЕ mappe `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Kunne ikke Фndre navn pЕ mappe `%s': %s eksisterer"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH-mapper kan ikke vФre rekursive."
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Lokal e-postkatalog %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -2514,11 +3421,12 @@ msgid "attachment"
 msgstr "bilag"
 
 #: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "VedhФft en fil"
 
-#: composer/e-msg-composer-attachment-bar.c:464 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Fjern"
 
@@ -2534,6 +3442,22 @@ msgstr "VedhФft bilag..."
 msgid "Attach a file to the message"
 msgstr "VedhФft bilag til meddelelsen"
 
+#.
+#. * 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
+msgid "Attachment properties"
+msgstr "Egenskaber for bilag"
+
+#: po/tmp/e-msg-composer-attachment.glade.h:8
+msgid "File name:"
+msgstr "Filnavn:"
+
+#: po/tmp/e-msg-composer-attachment.glade.h:9
+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
 msgid "From:"
@@ -2583,7 +3507,7 @@ msgstr "Emne:"
 msgid "Enter the subject of the mail"
 msgstr "Indtast emnet for meddelelsen"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -2592,38 +3516,38 @@ msgstr ""
 "Kunne ikke Еbne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fejl ved gemning af fil: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fejl ved indlФsning af fil: %s"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Gem Фndringer til meddelelse..."
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Gem Фndringer til beskeden..."
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fejl ved gemning af brevet i 'Skitser': %s"
 
-#: composer/e-msg-composer.c:738 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:744
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -2633,27 +3557,27 @@ msgstr ""
 "\n"
 "Vil du gemme Фndringene?"
 
-#: composer/e-msg-composer.c:766
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "еbn fil"
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Den fil eksisterer ikke."
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Dette er ikke en almindelig fil."
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Den fil eksisterer men kan ikke lФses."
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Den fil sЕ ud til at vФre tilgФngelig, men open(2) fejlede."
 
-#: composer/e-msg-composer.c:944
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2661,15 +3585,15 @@ msgstr ""
 "Filen er meget stor (mere end 100 k).\n"
 "Er du sikker pЕ at du Ьnsker at indsФtte den?"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "En fejl skete ved lФsning af filen."
 
-#: composer/e-msg-composer.c:1342
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Skriv en meddelelse"
 
-#: composer/e-msg-composer.c:1419
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Kan ikke oprette komponeringsvinduet."
 
@@ -2677,7 +3601,7 @@ msgstr "Kan ikke oprette komponeringsvinduet."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
-#: filter/e-search-bar.c:175
+#: filter/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "_SЬg..."
 
@@ -2785,7 +3709,7 @@ msgstr "indkommende"
 msgid "outgoing"
 msgstr "udgЕende"
 
-#: filter/filter-editor.c:456
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "RedigИr filtre"
 
@@ -2810,15 +3734,15 @@ msgstr ""
 "Du glemte at vФlge en mappe.\n"
 "Venligst gЕ tilbage og specificИr en gyldig mappe for levering af e-post."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "VФlg mappe"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Indtast URI for mappen"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<klik her for at vФlge en mappe>"
 
@@ -2872,6 +3796,35 @@ msgstr "TilfЬj kriterie"
 msgid "Remove criterion"
 msgstr "Fjern kriterie"
 
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
+msgid "Edit"
+msgstr "RedigИr"
+
+#: po/tmp/filter.glade.h:10
+msgid "Edit VFolders"
+msgstr "RedigИr VFolder"
+
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "Filterregler"
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr "Indkommende"
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr "UdgЕende"
+
+#: po/tmp/filter.glade.h:15
+msgid "Virtual Folders"
+msgstr "Visuelle mapper"
+
+#: po/tmp/filter.glade.h:16
+msgid "vFolder Sources"
+msgstr "vFolder kilder"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
@@ -2921,10 +3874,6 @@ msgstr "Beskeden blev sendt"
 msgid "Move to Folder"
 msgstr "Flyt til folder"
 
-#: filter/libfilter-i18n.h:15
-msgid "Priority"
-msgstr "Prioritet"
-
 #: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Modtagere"
@@ -3061,15 +4010,16 @@ msgstr "TilfЬj regel for VFolder"
 msgid "Edit VFolder Rule"
 msgstr "RedigИr VFolder regel"
 
-#: mail/component-factory.c:203
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initialisere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:242
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "Kan ikke registrere gemning i skallen"
 
-#: mail/folder-browser.c:140
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Gem"
 
@@ -3121,19 +4071,17 @@ msgstr "FiltrИr efter modtager"
 msgid "Filter on Mailing List"
 msgstr "FiltrИr efter epostliste"
 
-#: mail/folder-browser.c:464
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "еbn"
 
-#: mail/folder-browser.c:465
-msgid "Edit"
-msgstr "RedigИr"
-
 #: mail/folder-browser.c:466
 msgid "Save As..."
 msgstr "Gem 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
 msgid "Print"
 msgstr "Udskriv"
 
@@ -3142,14 +4090,16 @@ msgid "Reply to Sender"
 msgstr "Svar til afsender"
 
 #: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 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
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Vidersend mellem linjerne"
 
@@ -3179,7 +4129,7 @@ msgstr "Fortryd sletning"
 msgid "Apply Filters"
 msgstr "Anvend filtre"
 
-#: mail/folder-browser.c:486
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Skab regel fra besked"
 
@@ -3260,15 +4210,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Du skal specificere modtagere for at kunne sende denne besked."
 
-#: mail/mail-callbacks.c:543
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Flyt meddelelse(r) til"
 
-#: mail/mail-callbacks.c:545
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "KopiИr meddelelse(r) til"
 
-#: mail/mail-callbacks.c:660
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3276,11 +4226,11 @@ msgstr ""
 "Du kan kun redigere beskeder lagret\n"
 "i Skitser-kataloget."
 
-#: mail/mail-callbacks.c:694 mail/mail-display.c:72
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:698 mail/mail-display.c:76
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -3288,15 +4238,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:743
+#: mail/mail-callbacks.c:748
 msgid "Save Message As..."
 msgstr "Gem besked som..."
 
-#: mail/mail-callbacks.c:745
+#: mail/mail-callbacks.c:750
 msgid "Save Messages As..."
 msgstr "Gem beskeder som..."
 
-#: mail/mail-callbacks.c:872
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3305,14 +4255,46 @@ msgstr ""
 "Fejl ved indlФsning af filter information:\n"
 "%s"
 
-#: mail/mail-callbacks.c:917
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/mail-callbacks.c:964
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Udskrivning af besked mislykkedes"
 
+#.
+#. * 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
+msgid "Identity"
+msgstr "Identitet"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "Epost-konfiguration"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "Epost-kilde"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Epost-transport"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr "Velkommen til Evolutions e-post-konfigurerings troldmand!\n"
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"Din epost-konfiguration er nu komplet.\n"
+"Klik \"FuldfЬr\" for at gemme dine nye indstillinger"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -3339,7 +4321,7 @@ msgstr "Organisation:"
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config-gui.c:501
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Signaturfil"
 
@@ -3463,35 +4445,56 @@ msgstr "ForespЬrger autorisations-muligheder for '%s'"
 msgid "Query authorization at \"%s\""
 msgstr "ForespЬrg autorisation for '%s'"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Kunne ikke oprette rЬr til %s: %s"
+#: po/tmp/mail-config.glade.h:7
+msgid "Address"
+msgstr "Adresse"
 
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Kunne ikke udfЬre %s: %s\n"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr "Identiteter"
 
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Kan ikke udfЬre fork pЕ %s: %s"
+#: po/tmp/mail-config.glade.h:11
+msgid "Mail Sources"
+msgstr "Epost-kilder"
+
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
+msgstr "_MarkИr alle meddelser som lФst"
 
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: po/tmp/mail-config.glade.h:14
+msgid "News Servers"
+msgstr "Nyhedstjenere"
+
+#: po/tmp/mail-config.glade.h:15
+msgid "News Sources"
+msgstr "Nyhedskilder"
+
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "Organisation"
+
+#: po/tmp/mail-config.glade.h:18
+msgid "Send messages in HTML format"
+msgstr "Send meddelser i HTML-format"
+
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Kilder"
+
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Indtast venligst din PGP/GPG adgangsfrase"
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Ingen adgangskode oplyst."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikke oprette rЬr til GPG/PGP: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP-program ikke tilgФngelig."
 
@@ -3569,62 +4572,62 @@ msgstr "Krypteret besked"
 msgid "Click icon to decrypt."
 msgstr "Klik pЕ ikonen for at dekryptere."
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peger til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1478
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peger til lokal fil (%s) gyldig pЕ netsted \"%s\""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peger til lokal fil (%s)"
 
-#: mail/mail-format.c:1516
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peger til ukendt eksternt data (\"%s\"-type)"
 
-#: mail/mail-format.c:1521
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "Fejludformet del for ekstern-krop."
 
-#: mail/mail-format.c:1691
+#: mail/mail-format.c:1695
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s skrev %s:\n"
 
-#: mail/mail-local.c:194
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "фndrer mappe \"%s\" til \"%s\" format"
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "фndr mappe \"%s\" til \"%s\" format"
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Lukker aktiv mappe"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "фndrer navn pЕ gammel mappe og genЕbner"
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Opretter en ny mappe"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopierer beskeder"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -3633,7 +4636,7 @@ msgstr ""
 "Kan ikke gemme metainformation for mappe; du vil sandsynligvis\n"
 "ikke kunne Еbne denne mappe igen: %s"
 
-#: mail/mail-local.c:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -3641,11 +4644,11 @@ msgstr ""
 "Hvis du ikke kan Еbne denne postboks igen skal\n"
 "du reparere den manuelt."
 
-#: mail/mail-local.c:668
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr "Registrerer lokal mappe"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "RegistrИr lokal mappe"
 
@@ -3765,166 +4768,166 @@ msgstr "MarkИr meddelelser i mappe '%s'"
 msgid "Marking message %d of %d"
 msgstr "Markerer meddelelse %d ud af %d"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i '%s'"
 
-#: mail/mail-ops.c:1300
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Skan mapper i '%s'"
 
-#: mail/mail-ops.c:1369 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1430
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "VedhФfter bilag fra mappe '%s'"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "VedhФft bilag fra '%s'"
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Videresender meddelelser '%s'"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Videresender en meddelelse uden emne"
 
-#: mail/mail-ops.c:1540
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Videresend meddelelse '%s'"
 
-#: mail/mail-ops.c:1544
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Videresend en meddelelse uden emne"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter besked nummer %d af %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Kunne ikke generere MIME-del fra besked under generering af videresendt "
 "besked."
 
-#: mail/mail-ops.c:1663
+#: mail/mail-ops.c:1665
 msgid "Forwarded messages"
 msgstr "Videresendte meddelelser"
 
-#: mail/mail-ops.c:1677
+#: mail/mail-ops.c:1679
 msgid "Forwarded message:\n"
 msgstr "Videresendt meddelelse:\n"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "IndlФser '%s'"
 
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "IndlФs '%s'"
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Opretter '%s'"
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Opret '%s'"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr "Undtagelse under rapportering af resultat til skalkomponentens lytter."
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniserer \"%s\""
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "SynkronisИr \"%s\""
 
-#: mail/mail-ops.c:2013
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Viser besked-UID \"%s\""
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "TЬmmer beskedsvisning"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Vis beskeds-UID \"%s\""
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "TЬm beskedsvisning"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "еbner beskeder fra mappe \"%s\""
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "еbn beskeder fra \"%s\""
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "IndlФser '%s' mappe"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "IndlФs '%s' mappe"
 
-#: mail/mail-ops.c:2308
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Viser beskeder fra mappe \"%s\""
 
-#: mail/mail-ops.c:2311
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Vis beskeder fra \"%s\""
 
-#: mail/mail-ops.c:2337
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Henter besked %d af %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2426
+#: mail/mail-ops.c:2428
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Gemmer beskeder fra mappe '%s'"
 
-#: mail/mail-ops.c:2429
+#: mail/mail-ops.c:2431
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Gem beskeder fra mappe '%s'"
 
-#: mail/mail-ops.c:2472
+#: mail/mail-ops.c:2474
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Gemmer besked %d af %d (uid \"%s\")"
@@ -3933,7 +4936,7 @@ msgstr "Gemmer besked %d af %d (uid \"%s\")"
 msgid "Cancel"
 msgstr "AnnullИr"
 
-#: mail/mail-summary.c:104 mail/mail-threads.c:728
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "UfuldstФndig meddelse skrevet til rЬr!"
 
@@ -4044,62 +5047,62 @@ msgstr "Ny VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:153
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Svar til afsenderen af denne meddelelse"
 
-#: mail/mail-view.c:156
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Svar til alle modtagere af denne meddelelse"
 
-#: mail/mail-view.c:159
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Videresend denne meddelelse"
 
-#: mail/mail-view.c:163
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Udskriv den valgte meddelelse"
 
-#: mail/mail-view.c:165
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Slet denne meddelelse"
 
-#: mail/message-list.c:574
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "UlФst"
 
-#: mail/message-list.c:577
+#: mail/message-list.c:575
 msgid "Seen"
 msgstr "LФst"
 
-#: mail/message-list.c:580
+#: mail/message-list.c:578
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:848
+#: mail/message-list.c:846
 #, 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:860 mail/message-list.c:875
+#: mail/message-list.c:858 mail/message-list.c:873
 #, c-format
 msgid "%s, et al."
 msgstr "%s m.fl."
 
-#: mail/message-list.c:862 mail/message-list.c:877
+#: mail/message-list.c:860 mail/message-list.c:875
 msgid "<unknown>"
 msgstr "<ukendt>"
 
-#: mail/message-list.c:2159
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "Opbygger beskedsvisningen igen"
 
-#: mail/message-list.c:2161
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Genopbyg beskedsvisningen"
 
@@ -4284,13 +5287,6 @@ msgstr "(Ingen mappe vist)"
 msgid "Folders"
 msgstr "Mapper"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: shell/e-shell-view.c:1073 widgets/misc/e-dateedit.c:422
-#: widgets/misc/e-dateedit.c:1331 widgets/misc/e-dateedit.c:1446
-msgid "None"
-msgstr "Ingen"
-
 #: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
@@ -4379,6 +5375,16 @@ msgstr "Fjern denne genvej fra genvejsbjФlken"
 msgid "Error saving shortcuts."
 msgstr "Fejl under gemning af genveje."
 
+#: 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
+msgid "_View"
+msgstr "_Vis"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Vis den valgte mappe"
+
 #: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Uden navn)"
@@ -4427,14 +5433,6 @@ msgstr "Operationen er ikke understЬttet"
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivne type er ikke understЬttet i denne gemning"
 
-#: shell/e-storage-set-view.c:235
-msgid "_View"
-msgstr "_Vis"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Vis den valgte mappe"
-
 #: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -4494,1834 +5492,1331 @@ msgstr "Deaktiveret"
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kunne ikke initialisere Bonobo-komponentsystemet."
 
-#: ui/evolution-contact-editor.xml:7
-msgid "FIXME: _Appointment"
-msgstr "_Aftale"
-
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr "Opgavefo_respЬrgsel"
-
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "Send _besked"
-
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "_Kontakt"
-
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "_Opgave"
-
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "Opgavefo_respЬrgsel"
-
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "_JournalopfЬring"
-
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "_Notits"
-
-#: ui/evolution-contact-editor.xml:17 ui/evolution-contact-editor.xml:122
-msgid "FIXME: Ch_oose Form..."
-msgstr "VФlg skema..."
-
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr "_Notits-stil"
-
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
-msgstr "DefinИr udskrifts-stile..."
-
-#: ui/evolution-contact-editor.xml:31
-msgid "FIXME: S_end"
-msgstr "_Send"
-
-#: ui/evolution-contact-editor.xml:35
-msgid "FIXME: Save Attac_hments..."
-msgstr "Gem _bilag..."
-
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "_Flyt til mappe..."
-
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "KopiИr til mappe..."
-
-#: ui/evolution-contact-editor.xml:41
-msgid "Page Set_up"
-msgstr "Side_opsФtning"
-
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "ForhЕndsvisning af udskrift"
-
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
-msgstr "IndsФt _special..."
-
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
-msgstr "MФrk som _ulФst"
-
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Objekt"
-
-#: ui/evolution-contact-editor.xml:77 ui/evolution-contact-editor.xml:84
-msgid "FIXME: _Item"
-msgstr "_OpfЬring"
-
-#: ui/evolution-contact-editor.xml:78 ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr "_UlФst opfЬring"
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FЬ_rste opfЬring i mappe"
-
-#: ui/evolution-contact-editor.xml:86
-msgid "FIXME: _Last Item in Folder"
-msgstr "_Sidste opfЬring i mappe"
-
-#: ui/evolution-contact-editor.xml:91
-msgid "FIXME: _Standard"
-msgstr "_Standard"
-
-#: ui/evolution-contact-editor.xml:93
-msgid "FIXME: __Formatting"
-msgstr "_Formatering"
-
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr "_Tilpas..."
-
-#: ui/evolution-contact-editor.xml:101
-msgid "Pre_vious"
-msgstr "Forri_ge"
-
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
-msgstr "_NФste"
-
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "VФrk_tЬjslinjer"
-
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "_Fil..."
-
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr "Op_fЬring"
-
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr "_Objekt..."
-
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "FIXME: Skri_fttyper..."
-
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "_Afsnit..."
-
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr "_Udform dette skema"
-
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr "U_dform et skema..."
-
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr "PublicИr skema..."
-
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr "Pu_blicИr skema som..."
-
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "FejlsЬgning i skript"
-
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "_Stavekontrol..."
-
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "Sk_emaer"
+#.
+#. * 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-tjener"
 
-#: ui/evolution-contact-editor.xml:142
-msgid "FIXME: _New Contact"
-msgstr "_Ny kontaktperson"
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
+msgid "_Actions"
+msgstr "_Handlinger"
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr "Ny _Kontaktperson fra samme organisation"
+#: po/tmp/evolution-addressbook.xml.h:7
+msgid "Create a new contact"
+msgstr "Opret en ny kontakt"
 
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr "Nyt _brev til kontaktperson"
+#: po/tmp/evolution-addressbook.xml.h:9
+msgid "Delete a contact"
+msgstr "Slet en kontakt"
 
-#: ui/evolution-contact-editor.xml:146
-msgid "FIXME: New _Message to Contact"
-msgstr "Ny _meddelelse til kontaktperson"
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
+msgid "Find"
+msgstr "Find"
 
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "Nyt _mЬde med kontakt"
+#: po/tmp/evolution-addressbook.xml.h:11
+msgid "Find a contact"
+msgstr "Find kontakt"
 
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
-msgstr "_PlanlФg et mЬde..."
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+msgid "New"
+msgstr "Ny"
 
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
-msgstr "_Ny _Opgave for kontakt"
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
+msgstr "Udskriv kontakt"
 
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "Ny _journalopfЬring for kontakt"
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
+msgstr "Stop"
 
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "_Flag for opfЬlgning..."
+#: po/tmp/evolution-addressbook.xml.h:16
+msgid "Stop Loading"
+msgstr "Stop indlФsning"
 
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr "_Vis sammenhФng mellem adresser"
+#: po/tmp/evolution-addressbook.xml.h:17
+msgid "View All"
+msgstr "Vis alle"
 
-#: ui/evolution-contact-editor.xml:154
-msgid "FIXME: _Open Web Page"
-msgstr "_еbn netside"
+#: po/tmp/evolution-addressbook.xml.h:18
+msgid "View all contacts"
+msgstr "Vis alle kontakter"
 
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr "Videresend som v_Card"
+#: po/tmp/evolution-addressbook.xml.h:19
+msgid "_Print Contacts..."
+msgstr "_Udskriv kontakter..."
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "_Videresend"
-
-#: ui/evolution-contact-editor.xml:169
-msgid "_Insert"
-msgstr "_IndsФt"
-
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "F_ormat"
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
+msgstr "_SЬg efter kontakter"
 
-#: ui/evolution-contact-editor.xml:171
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_VФrktЬj"
 
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "Ha_ndlinger"
-
-#: ui/evolution-contact-editor.xml:246
-msgid "FIXME: Previous"
-msgstr "Forrige"
-
-#: ui/evolution-contact-editor.xml:247
-msgid "Go to the previous item"
-msgstr "GЕ til forrige opfЬring"
-
-#: ui/evolution-contact-editor.xml:249
-msgid "FIXME: Next"
-msgstr "_NФste"
-
-#: ui/evolution-contact-editor.xml:250
-msgid "Go to the next item"
-msgstr "GЕ til nФste opfЬring"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
-msgid "Tentative"
-msgstr "Tentativ"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-calendar.xml.h:6
+msgid "5 Days"
+msgstr "Fem dage"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
-msgid "Busy"
-msgstr "Optaget"
+#: po/tmp/evolution-calendar.xml.h:7
+msgid "Alter preferences"
+msgstr "фndr opsФtning"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
-msgid "Out of Office"
-msgstr "Ude"
+#: po/tmp/evolution-calendar.xml.h:8
+msgid "Ca_lendar"
+msgstr "_Kalender"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
-msgid "No Information"
-msgstr "Ingen information"
-
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
-msgid "_Invite Others..."
-msgstr "_InvitИr andre..."
+#: po/tmp/evolution-calendar.xml.h:9
+msgid "Calendar Preferences..."
+msgstr "OpsФtning af kalender"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
-msgid "_Options"
-msgstr "_Alternativer"
+#: po/tmp/evolution-calendar.xml.h:10
+msgid "Create a new appointment"
+msgstr "Opret en ny aftale"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
-msgid "Show _Only Working Hours"
-msgstr "Vis k_un arbejdstid"
+#: po/tmp/evolution-calendar.xml.h:11
+msgid "Create a new calendar"
+msgstr "Opret en ny kalender"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
-msgid "Show _Zoomed Out"
-msgstr "Vis _zoomet ud"
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr "Dag"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
-msgid "_Update Free/Busy"
-msgstr "_Opdater fri/optaget"
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr "GЕ tilbage i tiden"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
-msgid "_<<"
-msgstr "_<<"
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr "GЕ fremad i tid"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
-msgid "_Autopick"
-msgstr "_AutovФlg"
+#: po/tmp/evolution-calendar.xml.h:15
+msgid "Go to"
+msgstr "GЕ til"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
-msgid ">_>"
-msgstr ">_>"
+#: po/tmp/evolution-calendar.xml.h:16
+msgid "Go to a specific date"
+msgstr "GЕ til specifik dato"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
-msgid "_All People and Resources"
-msgstr "_Alle mennesker og resurser"
+#: po/tmp/evolution-calendar.xml.h:17
+msgid "Go to present time"
+msgstr "GЕ til nutiden"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
-msgid "All _People and One Resource"
-msgstr "Alle _mennesker og en resurse"
+#: po/tmp/evolution-calendar.xml.h:18
+msgid "Month"
+msgstr "MЕned"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
-msgid "_Required People"
-msgstr "_NЬdvendige mennesker"
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+#, fuzzy
+msgid "Next"
+msgstr "_NФste"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
-msgid "Required People and _One Resource"
-msgstr "NЬdvendige mennesker _og en resurse"
+#: po/tmp/evolution-calendar.xml.h:21
+msgid "Open a calendar"
+msgstr "еbn en kalender"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
-msgid "Meeting _start time:"
-msgstr "Tid for mЬdets _start:"
+#: po/tmp/evolution-calendar.xml.h:22
+msgid "Prev"
+msgstr "Smugkig"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
-msgid "Meeting _end time:"
-msgstr "Tid for mЬdets slutning:"
+#: po/tmp/evolution-calendar.xml.h:24
+msgid "Print this calendar"
+msgstr "Udskriv denne kalender"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
-msgid "All Attendees"
-msgstr "Alle deltagere"
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
+msgstr "Gem kalender som noget andet"
 
-#. 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
-msgid "%A, %B %d, %Y"
-msgstr "%A den %d. %B %Y"
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr "Vis Иn dag"
 
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
-msgid "%B %Y"
-msgstr "%B %Y"
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr "Vis Иn mЕned"
 
-#: widgets/misc/e-clipped-label.c:107
-msgid "..."
-msgstr "..."
+#: po/tmp/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr "Vis Иn uge"
 
-#: widgets/misc/e-dateedit.c:408
-msgid "Now"
-msgstr "nu"
+#: po/tmp/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr "Vis arbejdsugen"
 
-#: widgets/misc/e-dateedit.c:414
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "I dag"
 
-#. 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
-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
-msgid "%I:%M %p"
-msgstr " "
-
-#: widgets/shortcut-bar/e-group-bar.c:632
-#, c-format
-msgid "Group %i"
-msgstr "Gruppe %i"
-
-#: camel/providers/imap/camel-imap-auth.c:124
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kunne ikke fЕ fat pЕ Kerberos billet:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:195
-msgid "Bad authentication response from server."
-msgstr "Forkert autoriseringsbesked fra server."
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "UNIX e-postkataloger i MH-format (CamelLocal version)"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "UNIX e-post filer i mbox-format (CamelLocal version)"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "For gemning af lokal e-post i standard mbox format"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr "UNIX e-post filer i qmail maildir-format (CamelLocal version)"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "For gemning af lokal e-post i qmail beskedskataloger"
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Gemme-rod %s er ikke en absolut sti"
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Gemme-rod %s er ikke et almindeligt katalog"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Kan ikke fЕ fat pЕ mappe: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Lokale gemmesteder har ikke en rod-mappe"
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Lokale gemmesteder har ikke en standard-mappe"
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Lokale mapper kan ikke vФre underopdelte."
-
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Kunne ikke Фndre navn pЕ mappe %s til %s: %s"
-
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Kunne ikke slette oversigtsfil `%s': %s"
-
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Kunne ikke slette indeksfil `%s': %s"
-
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan ikke tilfЬje besked i maildir-mappe: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Ingen sЕdan besked"
-
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
-msgid "Invalid message contents"
-msgstr "Ugyldigt indhold af meddelelse"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' er ikke et maildir katalog."
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "ikke et maildir katalog"
-
-#: camel/providers/local/camel-mbox-folder.c:195
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kan ikke Еbne postboks: %s: %s\n"
-
-#: camel/providers/local/camel-mbox-folder.c:251
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan ikke tilfЬje besked i mbox-filen: %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
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan ikke hente besked: %s fra mappe %s\n"
-"  %s"
-
-#: camel/providers/local/camel-mbox-folder.c:358
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Mappen set ud til at vФre uigenkaldeligt Ьdelagt."
-
-#: camel/providers/local/camel-mbox-folder.c:369
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Fremstilling af besked mislykkedes: Er postkassen Ьdelagt?"
-
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Kunne ikke Еbne mappe: %s: summerer fra position %ld: %s"
-
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Uoprettelig fejl ved fortolkning af post nФr position %ld i mappe %s"
-
-#: camel/providers/local/camel-mbox-summary.c:341
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Kan ikke lave oversigt over folder: %s: %s"
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Uge"
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+msgid "_New"
+msgstr "_Ny"
+
+#: po/tmp/evolution-calendar.xml.h:33
+msgid "_Open Calendar"
+msgstr "_еbn kalender"
+
+#: po/tmp/evolution-calendar.xml.h:34
+msgid "_Print this calendar"
+msgstr "_Udskriv denne kalender"
+
+#: po/tmp/evolution-calendar.xml.h:35
+msgid "_Save Calendar As"
+msgstr "_Gem kalender som"
+
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Slet dette punkt"
+
+#: po/tmp/evolution-contact-editor.xml.h:8
+msgid "Delete..."
+msgstr "Slet..."
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+msgid "Help"
+msgstr "HjФlp"
+
+#: po/tmp/evolution-contact-editor.xml.h:10
+msgid "Print En_velope..."
+msgstr "Skriv kuvert..."
+
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
+msgid "Print this item"
+msgstr "Udskriv denne ting"
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
+msgid "Print..."
+msgstr "Udskriv..."
+
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "_Gem som..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr "Gem og luk"
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
+msgstr "Gem kontakten og luk dialogboksen"
+
+#: po/tmp/evolution-contact-editor.xml.h:16
+msgid "Se_nd contact to other..."
+msgstr "Send _kontaktperson til andre..."
+
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
+msgid "See online help"
+msgstr "Se hjФlpetekster"
+
+#: po/tmp/evolution-contact-editor.xml.h:18
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "Ny _meddelelse til kontaktperson"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Kunne ikke Еbne folder der skal laves oversigt for: %s: %s"
+#: 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
+msgid "_File"
+msgstr "_Fil"
 
-#: 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
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Oversigt og mappe uoverensstemmelse, selv efter synkronisering"
+#: po/tmp/evolution-contact-editor.xml.h:20
+msgid "_Print..."
+msgstr "_Udskriv..."
 
-#: camel/providers/local/camel-mbox-summary.c:579
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fejl under skriving til midlertidig postboks: %s: %s"
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
+msgid "_Save"
+msgstr "_Gem"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan ikke tilfЬje besked i mh-mappe: %s: %s"
+#.
+#. * 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
+msgid "About this application"
+msgstr "Om denne applikation"
 
-#~ msgid "Delete Contact?"
-#~ msgstr "Slet kontakt?"
+#: po/tmp/evolution-event-editor.xml.h:7
+msgid "About..."
+msgstr "Om..."
 
-#~ msgid "Address _2:"
-#~ msgstr "Adresse _2:"
+#: po/tmp/evolution-event-editor.xml.h:8
+msgid "Actio_ns"
+msgstr "Ha_ndlinger"
 
-#~ msgid "Canada"
-#~ msgstr "Canada"
+#: po/tmp/evolution-event-editor.xml.h:9
+msgid "C_lear"
+msgstr "T_Ьm"
 
-#~ msgid "Check Address"
-#~ msgstr "Tjek adresse"
+#: po/tmp/evolution-event-editor.xml.h:10
+msgid "C_ut"
+msgstr "Klip _ud"
 
-#~ msgid "Countr_y:"
-#~ msgstr "_Land:"
+#: po/tmp/evolution-event-editor.xml.h:11
+msgid "Clear"
+msgstr "TЬm"
 
-#~ msgid "Finland"
-#~ msgstr "Finland"
+#: po/tmp/evolution-event-editor.xml.h:12
+msgid "Clear the selection"
+msgstr "TЬm det valgte"
 
-#~ msgid "USA"
-#~ msgstr "USA"
+#: po/tmp/evolution-event-editor.xml.h:14
+msgid "Close this appointment"
+msgstr "Luk denne aftale"
 
-#~ msgid "_Address:"
-#~ msgstr "_Adresse:"
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+msgid "Copy"
+msgstr "KopiИr"
 
-#~ msgid "_City:"
-#~ msgstr "_By:"
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr "KopiИr valget"
 
-#~ msgid "_PO Box:"
-#~ msgstr "_Postboks:"
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "Klip ud"
 
-#~ msgid "_State/Province:"
-#~ msgstr "_Stat/Provins:"
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr "Klip valget ud"
 
-#~ msgid "_ZIP Code:"
-#~ msgstr "_ZIP/Postnummer:"
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr "Dump XML"
 
-#~ msgid "Description:"
-#~ msgstr "Beskrivelse:"
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr "Dump beskrivelse af grФnsesnittet som XML"
 
-#~ msgid "LDAP Server:"
-#~ msgstr "LDAP-tjener:"
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr "Adresse_bog..."
 
-#~ msgid "Name:"
-#~ msgstr "Navn:"
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr "VФlg skema..."
 
-#~ msgid "Port Number:"
-#~ msgstr "Portnummer:"
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr "Tje_k navn"
 
-#~ msgid "Root DN:"
-#~ msgstr "Rod DN:"
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
+msgstr "KopiИr til mappe..."
 
-#~ msgid "Find..."
-#~ msgstr "Find..."
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
+msgstr "U_dform et skema..."
 
-#~ msgid "Message Recipients"
-#~ msgstr "Modtagerliste:"
+#: po/tmp/evolution-event-editor.xml.h:28
+#, fuzzy
+msgid "FIXME: Define Print _Styles"
+msgstr "DefinИr udskrifts-stile..."
 
-#~ msgid "Select Names"
-#~ msgstr "VФlg mappe"
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr "_Udform dette skema"
 
-#~ msgid "Select name from List:"
-#~ msgstr "VФlg navn fra liste:"
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FЬ_rste opfЬring i mappe"
 
-#~ msgid "123"
-#~ msgstr "123"
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
+msgstr "_Videresend"
 
-#~ msgid "a"
-#~ msgstr "a"
+#: po/tmp/evolution-event-editor.xml.h:32
+#, fuzzy
+msgid "FIXME: Forward as v_Calendar"
+msgstr "Videresend som v_Card"
 
-#~ msgid "b"
-#~ msgstr "b"
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr "HjФlp"
 
-#~ msgid "c"
-#~ msgstr "c"
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr "U_komplet opgave"
 
-#~ msgid "d"
-#~ msgstr "d"
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr "IndsФt fil"
 
-#~ msgid "e"
-#~ msgstr "e"
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr "Op_fЬring"
 
-#~ msgid "f"
-#~ msgstr "f"
+#: po/tmp/evolution-event-editor.xml.h:37
+#, fuzzy
+msgid "FIXME: Paste _Special... "
+msgstr "IndsФt _special..."
 
-#~ msgid "g"
-#~ msgstr "g"
+#: po/tmp/evolution-event-editor.xml.h:38
+msgid "FIXME: Print Pre_view"
+msgstr "ForhЕndsvisning af udskrift"
 
-#~ msgid "i"
-#~ msgstr "i"
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr "Pu_blicИr skema som..."
 
-#~ msgid "j"
-#~ msgstr "j"
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr "PublicИr skema..."
 
-#~ msgid "k"
-#~ msgstr "k"
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr "Gentagelse..."
 
-#~ msgid "l"
-#~ msgstr "l"
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr "_Send"
 
-#~ msgid "m"
-#~ msgstr "m"
+#: po/tmp/evolution-event-editor.xml.h:43
+msgid "FIXME: Save Attac_hments..."
+msgstr "Gem _bilag..."
 
-#~ msgid "n"
-#~ msgstr "n"
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr "FejlsЬgning i skript"
 
-#~ msgid "o"
-#~ msgstr "o"
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr "Opgavefo_respЬrgsel"
 
-#~ msgid "p"
-#~ msgstr "p"
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr "_Kontakt"
 
-#~ msgid "q"
-#~ msgstr "q"
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr "_Tilpas..."
 
-#~ msgid "r"
-#~ msgstr "r"
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr "_Fil..."
 
-#~ msgid "s"
-#~ msgstr "s"
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr "FIXME: Skri_fttyper..."
 
-#~ msgid "t"
-#~ msgstr "t"
+#: po/tmp/evolution-event-editor.xml.h:50
+#, fuzzy
+msgid "FIXME: _Formatting"
+msgstr "_Formatering"
 
-#~ msgid "u"
-#~ msgstr "u"
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr "_OpfЬring"
 
-#~ msgid "v"
-#~ msgstr "v"
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr "_JournalopfЬring"
 
-#~ msgid "w"
-#~ msgstr "w"
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr "_Sidste opfЬring i mappe"
 
-#~ msgid "x"
-#~ msgstr "x"
+#: po/tmp/evolution-event-editor.xml.h:54
+msgid "FIXME: _Mail Message"
+msgstr "Send _besked"
 
-#~ msgid "y"
-#~ msgstr "y"
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr "_Notits-stil"
 
-#~ msgid "z"
-#~ msgstr "z"
+#: po/tmp/evolution-event-editor.xml.h:56
+msgid "FIXME: _Move to Folder..."
+msgstr "_Flyt til mappe..."
 
-#~ msgid "10 pt. Tahoma"
-#~ msgstr "10 pt. Tahoma"
+#: po/tmp/evolution-event-editor.xml.h:57
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "_Aftale"
 
-#~ msgid "8 pt. Tahoma"
-#~ msgstr "8 pt. Tahoma"
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr "_Notits"
 
-#~ msgid "Blank forms at end:"
-#~ msgstr "Blanke skemaer ved slutningen:"
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr "_Objekt..."
 
-#~ msgid "Body"
-#~ msgstr "Krop"
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr "_Afsnit..."
 
-#~ msgid "Bottom:"
-#~ msgstr "Bund:"
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr "_Stavekontrol..."
 
-#~ msgid "Dimensions:"
-#~ msgstr "Dimensioner:"
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr "_Standard"
 
-#~ msgid "Font..."
-#~ msgstr "Skrifttype..."
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr "_Opgave"
 
-#~ msgid "Fonts"
-#~ msgstr "Skrifttyper"
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr "_UlФst opfЬring"
 
-#~ msgid "Footer:"
-#~ msgstr "Bundtekst:"
+#: po/tmp/evolution-event-editor.xml.h:65
+msgid "FIXME: what goes here?"
+msgstr "Hvad skal vФre her?"
 
-#~ msgid "Format"
-#~ msgstr "Format"
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
+msgid "F_ormat"
+msgstr "F_ormat"
 
-#~ msgid "Header"
-#~ msgstr "Toptekst"
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr "Find igen"
 
-#~ msgid "Header/Footer"
-#~ msgstr "Top-/bundtekst"
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr "Find ig_en"
 
-#~ msgid "Headings"
-#~ msgstr "Overskrifter"
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr "GЕ til nФste opfЬring"
 
-#~ msgid "Headings for each letter"
-#~ msgstr "Toptekst for hvert bogstav"
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr "GЕ til forrige opfЬring"
 
-#~ msgid "Height:"
-#~ msgstr "HЬjde:"
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr "фndr filens egenskaber"
 
-#~ msgid "Immediately follow each other"
-#~ msgstr "Lige efter hinanden"
+#: po/tmp/evolution-event-editor.xml.h:73
+msgid "N_ext"
+msgstr "N_Фste"
 
-#~ msgid "Include:"
-#~ msgstr "InkludИr:"
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "IndsФt"
 
-#~ msgid "Landscape"
-#~ msgstr "Landskab"
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr "IndsФt fra klippebordet"
 
-#~ msgid "Left:"
-#~ msgstr "Venstre:"
+#: po/tmp/evolution-event-editor.xml.h:77
+msgid "Pre_vious"
+msgstr "Forri_ge"
 
-#~ msgid "Letter tabs on side"
-#~ msgstr "Bogstavfaner pЕ siden"
+#: po/tmp/evolution-event-editor.xml.h:78
+#, fuzzy
+msgid "Previous"
+msgstr "Forri_ge"
 
-#~ msgid "Margins"
-#~ msgstr "Marginer"
+#: po/tmp/evolution-event-editor.xml.h:79
+msgid "Print S_etup..."
+msgstr "Skriverops_Фtning..."
+
+#: po/tmp/evolution-event-editor.xml.h:80
+msgid "Print Setup"
+msgstr "SkriveropsФtning"
+
+#: po/tmp/evolution-event-editor.xml.h:83
+msgid "Properties"
+msgstr "Egenskaber"
+
+#: po/tmp/evolution-event-editor.xml.h:84
+msgid "Redo"
+msgstr "Genopret"
+
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr "Genopret fortrudt handling"
+
+#: po/tmp/evolution-event-editor.xml.h:86
+msgid "Replace"
+msgstr "Erstat"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr "Erstat en streng"
+
+#: po/tmp/evolution-event-editor.xml.h:91
+msgid "Save the appointment and close the dialog box"
+msgstr "Gem aftalen og luk dialogboksen"
+
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
+msgid "Save the current file"
+msgstr "Gem aktiv fil"
+
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr "PlanlФg mЬde"
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr "_PlanlФg mЬde"
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr "OpsФt et eller andet mЬde"
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr "SЬg efter samme streng igen"
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr "SЬg efter en streng"
+
+#: po/tmp/evolution-event-editor.xml.h:99
+msgid "Select All"
+msgstr "VФlg alle"
+
+#: po/tmp/evolution-event-editor.xml.h:100
+msgid "Select everything"
+msgstr "VФlg alt"
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr "RedigИr sideindstillinger for aktiv skriver"
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr "Fortryd"
+
+#: po/tmp/evolution-event-editor.xml.h:103
+msgid "Undo the last action"
+msgstr "Fortryd sidste handling"
+
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
+msgid "_About..."
+msgstr "_Om..."
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+msgid "_Close"
+msgstr "L_uk"
+
+#: po/tmp/evolution-event-editor.xml.h:106
+msgid "_Copy"
+msgstr "_KopiИr"
+
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
+msgid "_Debug"
+msgstr "_FejlsЬg"
+
+#: 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
+msgid "_Edit"
+msgstr "_RedigИr"
+
+#: po/tmp/evolution-event-editor.xml.h:111
+msgid "_Find..."
+msgstr "_Find..."
+
+#: po/tmp/evolution-event-editor.xml.h:112
+msgid "_Forms"
+msgstr "Sk_emaer"
 
-#~ msgid "Number of columns:"
-#~ msgstr "Antal kolonner:"
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+msgid "_Help"
+msgstr "_HjФlp"
 
-#~ msgid "Options"
-#~ msgstr "Alternativer"
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr "_IndsФt"
 
-#~ msgid "Orientation"
-#~ msgstr "Orientering"
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr "_Objekt"
 
-#~ msgid "Page"
-#~ msgstr "Side"
+#: po/tmp/evolution-event-editor.xml.h:116
+msgid "_Paste"
+msgstr "_IndsФt"
 
-#~ msgid "Paper"
-#~ msgstr "Papir"
+#: po/tmp/evolution-event-editor.xml.h:117
+msgid "_Print"
+msgstr "_Udskriv"
 
-#~ msgid "Paper source:"
-#~ msgstr "Papirkilde:"
+#: po/tmp/evolution-event-editor.xml.h:118
+msgid "_Properties..."
+msgstr "Egenska_ber..."
 
-#~ msgid "Portrait"
-#~ msgstr "PortrФt"
+#: po/tmp/evolution-event-editor.xml.h:119
+msgid "_Redo"
+msgstr "Genop_ret"
 
-#~ msgid "Preview:"
-#~ msgstr "Smugkig:"
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr "E_rstat..."
 
-#~ msgid "Print using gray shading"
-#~ msgstr "Udskriv med grЕtoner"
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
+msgstr "VФrk_tЬjslinjer"
 
-#~ msgid "Reverse on even pages"
-#~ msgstr "Modsat pЕ lige sider"
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
+msgstr "_Fortryd"
 
-#~ msgid "Right:"
-#~ msgstr "HЬjre:"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
+msgid "Compose"
+msgstr "Skriv"
 
-#~ msgid "Sections:"
-#~ msgstr "Sektioner:"
+#: po/tmp/evolution-mail.xml.h:7
+msgid "Compose a new message"
+msgstr "Skriv en ny meddelelse"
 
-#~ msgid "Shading"
-#~ msgstr "SkyggelФgning"
+#: po/tmp/evolution-mail.xml.h:9
+msgid "Copy message to a new folder"
+msgstr "KopiИr meddelelse til en ny mappe"
 
-#~ msgid "Size:"
-#~ msgstr "StЬrrelse:"
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+msgid "F_older"
+msgstr "_Mapper"
 
-#~ msgid "Start on a new page"
-#~ msgstr "Start pЕ en ny side"
+#: po/tmp/evolution-mail.xml.h:14
+msgid "Fi_lter on Sender"
+msgstr "FiltrИr _efter afsender"
 
-#~ msgid "Style name:"
-#~ msgstr "Stilnavn:"
+#: po/tmp/evolution-mail.xml.h:15
+msgid "Filter on Rec_ipients"
+msgstr "FiltrИr efter mod_tager"
 
-#~ msgid "Top:"
-#~ msgstr "Top:"
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr "Glem _adgangskoder"
 
-#~ msgid "Type:"
-#~ msgstr "Type:"
+#: po/tmp/evolution-mail.xml.h:20
+msgid "Get Mail"
+msgstr "Hent post"
 
-#~ msgid "Width:"
-#~ msgstr "Bredde:"
+#: po/tmp/evolution-mail.xml.h:21
+msgid "Mail _Filters"
+msgstr "E-post _filtre"
 
-#~ msgid "label26"
-#~ msgstr "etiket26"
+#: po/tmp/evolution-mail.xml.h:22
+msgid "Manage Subscriptions"
+msgstr "Behandl abonnementer"
 
-#~ msgid "Close"
-#~ msgstr "Luk"
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Mar_k As Read"
+msgstr "MФrk som _lФst"
 
-#~ msgid "Edit appointment"
-#~ msgstr "RedigИr aftale"
+#: po/tmp/evolution-mail.xml.h:24
+msgid "Mark As U_nread"
+msgstr "MФrk som _ulФst"
 
-#~ msgid "Snooze time (minutes)"
-#~ msgstr "UdsФt-tid (minutter)"
+#: po/tmp/evolution-mail.xml.h:25
+msgid "Move"
+msgstr "Flyt"
 
-#~ msgid "05 minutes"
-#~ msgstr "05 minutter"
+#: po/tmp/evolution-mail.xml.h:26
+msgid "Move message to a new folder"
+msgstr "Flyt meddelelsen til en ny mappe"
 
-#~ msgid "10 minutes"
-#~ msgstr "10 minutter"
+#: po/tmp/evolution-mail.xml.h:27
+msgid "Previews the message to be printed"
+msgstr "Viser forhЕndsvisning af beskeden som skal udskrives"
 
-#~ msgid "12 hour (am/pm)"
-#~ msgstr "12 timer (AM/PM)"
+#: po/tmp/evolution-mail.xml.h:29
+msgid "Print Preview of message..."
+msgstr "Udskriv forhЕndsvisning af besked..."
 
-#~ msgid "15 minutes"
-#~ msgstr "15 minutter"
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
+msgstr "Udskriv besked til printeren"
 
-#~ msgid "24 hour"
-#~ msgstr "24 timer"
+#: po/tmp/evolution-mail.xml.h:31
+msgid "Print message..."
+msgstr "Udskriv besked..."
 
-#~ msgid "30 minutes"
-#~ msgstr "30 minutter"
+#: po/tmp/evolution-mail.xml.h:35
+msgid "Reply to _All"
+msgstr "Svar til _alle"
 
-#~ msgid "60 minutes"
-#~ msgstr "60 minutter"
+#: po/tmp/evolution-mail.xml.h:36
+msgid "Reply to _Sender"
+msgstr "Svar til _afsender"
 
-#~ msgid "Alarms timeout after"
-#~ msgstr "Alarmer afbrydes efter"
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+msgid "Select _All"
+msgstr "VФlg _alle"
 
-#~ msgid "Audio Alarms"
-#~ msgstr "Lyd-alarmer"
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
+msgstr "Afsend kЬet post og modtag ny post"
 
-#~ msgid "Beep when alarm windows appear."
-#~ msgstr "Pip nЕr alarmvinduet kommer til syne."
+#: po/tmp/evolution-mail.xml.h:41
+msgid "Threaded Message list"
+msgstr "TrЕdet meddelelsesliste"
 
-#~ msgid "Calendar"
-#~ msgstr "Kalender"
+#: po/tmp/evolution-mail.xml.h:42
+msgid "VFolder on Se_nder"
+msgstr "VFolder for _afsender"
 
-#~ msgid "Calendar Preferences"
-#~ msgstr "OpsФtning af kalender"
+#: po/tmp/evolution-mail.xml.h:43
+msgid "VFolder on _Recipients"
+msgstr "VFolder for _modtagere"
 
-#~ msgid "Colors"
-#~ msgstr "Farver"
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr "Vis rЕ beskedskildetekst"
 
-#~ msgid "Compress weekends"
-#~ msgstr "Sammenpres weekender"
+#: po/tmp/evolution-mail.xml.h:45
+msgid "_Apply Filters"
+msgstr "_Anvend filtre"
 
-#~ msgid "Date navigator options"
-#~ msgstr "Alternativer for datonavigator"
+#: po/tmp/evolution-mail.xml.h:46
+msgid "_Configure Folder"
+msgstr "_KonfigurИr mappe"
 
-#~ msgid "Defaults"
-#~ msgstr "Forvalg"
+#: po/tmp/evolution-mail.xml.h:47
+msgid "_Copy to Folder..."
+msgstr "_KopiИr til mappe..."
 
-#~ msgid "Display options"
-#~ msgstr "Vis valgmuligheder"
+#: po/tmp/evolution-mail.xml.h:49
+msgid "_Edit Message"
+msgstr "_RedigИr besked"
 
-#~ msgid "Due Date"
-#~ msgstr "FФrdig-dato"
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
+msgstr "_Fjern"
 
-#~ msgid "Enable snoozing for"
-#~ msgstr "SlЕ udsФttelse til for"
+#: po/tmp/evolution-mail.xml.h:51
+msgid "_Filter on Subject"
+msgstr "_FiltrИr efter emne"
 
-#~ msgid "End of day:"
-#~ msgstr "Dagen slutter:"
+#: po/tmp/evolution-mail.xml.h:52
+msgid "_Forward"
+msgstr "_Videresend"
 
-#~ msgid "First day of week:"
-#~ msgstr "Ugens fЬrste dag:"
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr "Re_versИr udvalg"
 
-#~ msgid "Highlight"
-#~ msgstr "FremhФv:"
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
+msgstr "_Epost-konfiguration"
 
-#~ msgid "Items Due Today"
-#~ msgstr "Punkter som skal afsluttes idag"
+#: po/tmp/evolution-mail.xml.h:55
+msgid "_Message"
+msgstr "_Besked"
 
-#~ msgid "Items Due Today:"
-#~ msgstr "Punkter som skal afsluttes idag:"
+#: po/tmp/evolution-mail.xml.h:56
+msgid "_Move to Folder..."
+msgstr "_Flyt til mappe..."
 
-#~ msgid "Items Not Yet Due"
-#~ msgstr "Punkter som ikke skal afsluttes endnu"
+#: po/tmp/evolution-mail.xml.h:57
+msgid "_Open in New Window"
+msgstr "_еbn i nyt vindue"
 
-#~ msgid "Items Not Yet Due:"
-#~ msgstr "Punkter som ikke skal afsluttes endnu:"
+#: po/tmp/evolution-mail.xml.h:58
+msgid "_Print Message"
+msgstr "_Udskriv besked"
 
-#~ msgid "Overdue Items"
-#~ msgstr "Overskredne opgaver"
+#: po/tmp/evolution-mail.xml.h:59
+msgid "_Save Message As..."
+msgstr "_Gem besked som..."
 
-#~ msgid "Overdue Items:"
-#~ msgstr "Overskredne opgaver:"
+#: po/tmp/evolution-mail.xml.h:60
+msgid "_Source"
+msgstr "_Kilde"
 
-#~ msgid "Pick a color"
-#~ msgstr "VФlg en farve"
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr "_TrЕdet"
 
-#~ msgid "Remind me of all appointments"
-#~ msgstr "PЕmind mig om alle aftaler"
+#: po/tmp/evolution-mail.xml.h:62
+msgid "_Undelete"
+msgstr "_Fortryd sletning"
 
-#~ msgid "Reminders"
-#~ msgstr "PЕmindelser"
+#: po/tmp/evolution-mail.xml.h:63
+msgid "_VFolder on Subject"
+msgstr "_VFolder for emne"
 
-#~ msgid "Show"
-#~ msgstr "Vis"
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
+msgstr "Redigering af _virtuelle mapper"
 
-#~ msgid "Show appointment end times"
-#~ msgstr "Vis sluttider for aftaler"
+#.
+#. * 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
+msgid "Attach"
+msgstr "VedhФft"
 
-#~ msgid "Show week numbers"
-#~ msgstr "Vis ugenumre"
+#: po/tmp/evolution-message-composer.xml.h:9
+msgid "Close the current file"
+msgstr "Luk aktiv fil"
 
-#~ msgid "Start of day:"
-#~ msgstr "Dagens starter:"
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr "HTML"
 
-#~ msgid "TaskPad"
-#~ msgstr "Opgaveblok"
+#: po/tmp/evolution-message-composer.xml.h:12
+msgid "Insert a file as text into the message"
+msgstr "IndsФt en fil som tekst i meddelelsen"
 
-#~ msgid "Time Until Due"
-#~ msgstr "Tid til afslutning"
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert text file..."
+msgstr "IndsФt tekstfil..."
 
-#~ msgid "Time divisions:"
-#~ msgstr "Tidsopdeling:"
+#: po/tmp/evolution-message-composer.xml.h:15
+msgid "Open a file"
+msgstr "еbn en fil"
 
-#~ msgid "Time format:"
-#~ msgstr "Tidsformat:"
+#: po/tmp/evolution-message-composer.xml.h:17
+msgid "Save As"
+msgstr "Gem som"
 
-#~ msgid "Visual Alarms"
-#~ msgstr "Visuelle alarmer"
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save in _folder... (FIXME)"
+msgstr "Gem i _mappe..."
 
-#~ msgid "Work week"
-#~ msgstr "Arbejdsuge"
+#: po/tmp/evolution-message-composer.xml.h:20
+msgid "Save in folder..."
+msgstr "Gem i mappe..."
 
-#~ msgid "minutes before they occur."
-#~ msgstr "minutter fЬr de skal ske."
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr "Gem den aktive fil med et andet navn"
 
-#~ msgid "seconds."
-#~ msgstr "sekunder."
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "Gem meddelelsen i en angivet mappe"
 
-#~ msgid "% Comp_lete:"
-#~ msgstr "% fФrdi_g:"
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Send"
 
-#~ msgid "C_lassification:"
-#~ msgstr "_Klassificering"
+#: po/tmp/evolution-message-composer.xml.h:25
+msgid "Send _Later"
+msgstr "Send _senere"
 
-#~ msgid "Cancelled"
-#~ msgstr "Afbrudt"
+#: po/tmp/evolution-message-composer.xml.h:26
+msgid "Send _later"
+msgstr "Send se_nere"
 
-#~ msgid "Completed"
-#~ msgstr "FuldfЬrt"
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send the mail in HTML format"
+msgstr "Send meddelser i HTML-format"
 
-#~ msgid "Date Completed:"
-#~ msgstr "FuldfЬrt dato:"
+#: po/tmp/evolution-message-composer.xml.h:28
+msgid "Send the message later"
+msgstr "Send beskeden senere"
 
-#~ msgid "High"
-#~ msgstr "HЬj"
+#: po/tmp/evolution-message-composer.xml.h:29
+msgid "Send the message now"
+msgstr "Send meddelelsen nu"
 
-#~ msgid "In Progress"
-#~ msgstr "Under udarbejdelse"
+#: po/tmp/evolution-message-composer.xml.h:30
+msgid "Send this message now"
+msgstr "Send denne meddelelse nu"
 
-#~ msgid "Low"
-#~ msgstr "Lav"
+#: po/tmp/evolution-message-composer.xml.h:31
+msgid "Show / hide attachments"
+msgstr "Vis/skjul bilag"
 
-#~ msgid "Normal"
-#~ msgstr "Normal"
+#: po/tmp/evolution-message-composer.xml.h:32
+msgid "Show _attachments"
+msgstr "Vis _bilag"
 
-#~ msgid "Not Started"
-#~ msgstr "Ikke startet"
+#: po/tmp/evolution-message-composer.xml.h:33
+msgid "Show attachments"
+msgstr "Vis bilag"
 
-#~ msgid "S_ummary"
-#~ msgstr "_Sammendrag"
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr "_IndsФt tekstfil..."
 
-#~ msgid "Sta_rt Date:"
-#~ msgstr "Sta_rt dato:"
+#: po/tmp/evolution-message-composer.xml.h:41
+msgid "_Open..."
+msgstr "_еbn..."
 
-#~ msgid "Task"
-#~ msgstr "Opgave"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr "TilfЬj mappe pЕ listen over abonnerede mapper"
 
-#~ msgid "URL:"
-#~ msgstr "URL:"
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr "LФs listen igen"
 
-#~ msgid "_Contacts..."
-#~ msgstr "_Kontakter..."
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr "LФs mappelisten igen"
 
-#~ msgid "_Due Date:"
-#~ msgstr "Slut-_dato:"
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
+msgstr "Fjern mappe fra din liste over abonnerede mapper"
 
-#~ msgid "_Priority:"
-#~ msgstr "_Prioritet:"
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
+msgstr "AbonnИr"
 
-#~ msgid "_Status:"
-#~ msgstr "_Status:"
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr "Fjern abonnement"
 
-#~ msgid "task-editor-dialog"
-#~ msgstr "task-editor-dialog"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
+msgstr "Vis en anden mappe"
 
-#~ msgid "A_ll day event"
-#~ msgstr "Varer he_le dagen"
+#: po/tmp/evolution.xml.h:7
+msgid "E_xit"
+msgstr "_Afslut"
 
-#~ msgid "Appointment Basics"
-#~ msgstr "GrundlФggende om aftaler"
+#: po/tmp/evolution.xml.h:8
+msgid "Evolution bar _shortcut"
+msgstr "Evolution bjФlke _genvej"
 
-#~ msgid "Classification"
-#~ msgstr "Klassificering"
+#: po/tmp/evolution.xml.h:9
+msgid "Exit the program"
+msgstr "Afslut programmet"
 
-#~ msgid "Custom recurrence"
-#~ msgstr "Egendefineret genindtrФffelse"
+#: po/tmp/evolution.xml.h:10
+msgid "Getting _Started"
+msgstr "Kom _igang"
 
-#~ msgid "Days"
-#~ msgstr "Dage"
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
+msgstr "Vis oplysninger om Evolution"
 
-#~ msgid "Every"
-#~ msgstr "Hver"
+#: po/tmp/evolution.xml.h:12
+msgid "Show the _Folder Bar"
+msgstr "Vis mappe_bjФlken"
 
-#~ msgid "Exceptions"
-#~ msgstr "Undtagelser"
+#: po/tmp/evolution.xml.h:13
+msgid "Show the _Shortcut Bar"
+msgstr "Vis genvejsbjФlken"
 
-#~ msgid "Hours"
-#~ msgstr "Timer"
+#: po/tmp/evolution.xml.h:14
+msgid "Submit _Bug Report"
+msgstr "Indsend _fejlrapport"
 
-#~ msgid "Mail _to:"
-#~ msgstr "Send _til:"
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
+msgstr "Indsend fejlrapport med Fejl-Frede."
 
-#~ msgid "Minutes"
-#~ msgstr "Minutter"
+#: po/tmp/evolution.xml.h:16
+msgid "Toggle whether to show the folder bar"
+msgstr "SlЕ visning af mappelinjen til/fra"
 
-#~ msgid "Modify"
-#~ msgstr "фndr"
+#: po/tmp/evolution.xml.h:17
+msgid "Toggle whether to show the shortcut bar"
+msgstr "SlЕ visning af genvejslinjen til/fra"
 
-#~ msgid "No recurrence"
-#~ msgstr "Ingen genindtrФffelse"
+#: po/tmp/evolution.xml.h:18
+msgid "Using the C_ontact Manager"
+msgstr "Bruger behandleren af kontakter"
 
-#~ msgid "Preview"
-#~ msgstr "Smugkig"
+#: po/tmp/evolution.xml.h:19
+msgid "Using the _Calendar"
+msgstr "Brug af kalenderen"
 
-#~ msgid "Pri_vate"
-#~ msgstr "Pri_vat"
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
+msgstr "Brug af postdelen"
 
-#~ msgid "Pu_blic"
-#~ msgstr "Of_fentlig"
+#: po/tmp/evolution.xml.h:21
+msgid "_About Evolution..."
+msgstr "_Om Evolution..."
 
-#~ msgid "Recurrence"
-#~ msgstr "Gentagelse"
+#: po/tmp/evolution.xml.h:22
+msgid "_Appointment (FIXME)"
+msgstr "_Aftale"
 
-#~ msgid "Recurrence Rule"
-#~ msgstr "Regel for genindtrФffelse"
+#: po/tmp/evolution.xml.h:23
+msgid "_Contact (FIXME)"
+msgstr "_Kontakt"
 
-#~ msgid "Reminder"
-#~ msgstr "PЕmindelse"
+#: po/tmp/evolution.xml.h:26
+msgid "_Folder"
+msgstr "_Mapper"
 
-#~ msgid "Simple recurrence"
-#~ msgstr "Simpel genindtrФffelse"
+#: po/tmp/evolution.xml.h:27
+msgid "_Go to Folder..."
+msgstr "_GЕ til mappe..."
 
-#~ msgid "Su_mmary:"
-#~ msgstr "Sa_mmendrag:"
+#: po/tmp/evolution.xml.h:29
+msgid "_Index"
+msgstr "_Indeks"
 
-#~ msgid "Time"
-#~ msgstr "Tid"
+#: po/tmp/evolution.xml.h:30
+msgid "_Mail message (FIXME)"
+msgstr "Send _besked"
 
-#~ msgid "_Audio"
-#~ msgstr "_Lyd"
+#: po/tmp/evolution.xml.h:32
+msgid "_Settings"
+msgstr "_OpsФtning"
 
-#~ msgid "_Confidential"
-#~ msgstr "_Fortrolig"
+#: po/tmp/evolution.xml.h:33
+msgid "_Task (FIXME)"
+msgstr "Opgave"
 
-#~ msgid "_Display"
-#~ msgstr "_Vis"
+#. 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
+msgid "%A, %B %d, %Y"
+msgstr "%A den %d. %B %Y"
 
-#~ msgid "_End time:"
-#~ msgstr "S_lut-tid:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr "Tentativ"
 
-#~ msgid "_Mail"
-#~ msgstr "_E-post"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr "Optaget"
 
-#~ msgid "_Program"
-#~ msgstr "_Program"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr "Ude"
 
-#~ msgid "_Run program:"
-#~ msgstr "KЬ_r program:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr "Ingen information"
 
-#~ msgid "_Start time:"
-#~ msgstr "_Start-tid:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr "_InvitИr andre..."
 
-#~ msgid "_Starting date:"
-#~ msgstr "_Start dato:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+msgid "_Options"
+msgstr "_Alternativer"
 
-#~ msgid "day(s)"
-#~ msgstr "dag(e)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr "Vis k_un arbejdstid"
 
-#~ msgid "event-editor-dialog"
-#~ msgstr "event-editor-dialog"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr "Vis _zoomet ud"
 
-#~ msgid "for"
-#~ msgstr "for"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr "_Opdater fri/optaget"
 
-#~ msgid "forever"
-#~ msgstr "for evigt"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr "_<<"
 
-#~ msgid "label21"
-#~ msgstr "etiket21"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr "_AutovФlg"
 
-#~ msgid "month(s)"
-#~ msgstr "mЕned(er)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ">_>"
 
-#~ msgid "until"
-#~ msgstr "til"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr "_Alle mennesker og resurser"
 
-#~ msgid "week(s)"
-#~ msgstr "uge(r)"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr "Alle _mennesker og en resurse"
 
-#~ msgid "year(s)"
-#~ msgstr "Еr"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr "_NЬdvendige mennesker"
 
-#~ msgid "Attachment properties"
-#~ msgstr "Egenskaber for bilag"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr "NЬdvendige mennesker _og en resurse"
 
-#~ msgid "File name:"
-#~ msgstr "Filnavn:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr "Tid for mЬdets _start:"
 
-#~ msgid "MIME type:"
-#~ msgstr "MIME-type:"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr "Tid for mЬdets slutning:"
 
-#~ msgid "Edit VFolders"
-#~ msgstr "RedigИr VFolder"
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+msgstr "Alle deltagere"
 
-#~ msgid "Filter Rules"
-#~ msgstr "Filterregler"
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+msgid "%B %Y"
+msgstr "%B %Y"
 
-#~ msgid "Incoming"
-#~ msgstr "Indkommende"
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
 
-#~ msgid "Outgoing"
-#~ msgstr "UdgЕende"
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "nu"
 
-#~ msgid "Virtual Folders"
-#~ msgstr "Visuelle mapper"
+#. 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
+msgid "%H:%M"
+msgstr "%H:%M"
 
-#~ msgid "vFolder Sources"
-#~ msgstr "vFolder kilder"
+#. 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
+msgid "%I:%M %p"
+msgstr " "
 
-#~ msgid "Identity"
-#~ msgstr "Identitet"
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr "Gruppe %i"
 
-#~ msgid "Mail Configuration"
-#~ msgstr "Epost-konfiguration"
+#~ msgid "Could not create summary"
+#~ msgstr "Kunne ikke oprette sammendrag"
 
-#~ msgid "Mail Source"
-#~ msgstr "Epost-kilde"
+#~ msgid "Cannot append message to mbox file: %s"
+#~ msgstr "Kan ikke tilfЬje besked i mbox-filen: %s"
 
-#~ msgid "Mail Transport"
-#~ msgstr "Epost-transport"
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Kan ikke hente besked: %s"
 
-#~ msgid "Welcome to the Evolution Mail configuration wizard!\n"
-#~ msgstr "Velkommen til Evolutions e-post-konfigurerings troldmand!\n"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "UNIX e-post filer i mbox-format"
 
 #~ msgid ""
-#~ "Your email configuration is now complete.\n"
-#~ "Click \"Finish\" to save your new settings"
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
 #~ msgstr ""
-#~ "Din epost-konfiguration er nu komplet.\n"
-#~ "Klik \"FuldfЬr\" for at gemme dine nye indstillinger"
-
-#~ msgid "Address"
-#~ msgstr "Adresse"
-
-#~ msgid "Identities"
-#~ msgstr "Identiteter"
-
-#~ msgid "Mail Sources"
-#~ msgstr "Epost-kilder"
-
-#~ msgid "Mark message as seen [ms]: "
-#~ msgstr "_MarkИr alle meddelser som lФst"
-
-#~ msgid "News Servers"
-#~ msgstr "Nyhedstjenere"
-
-#~ msgid "News Sources"
-#~ msgstr "Nyhedskilder"
-
-#~ msgid "Organization"
-#~ msgstr "Organisation"
-
-#~ msgid "Send messages in HTML format"
-#~ msgstr "Send meddelser i HTML-format"
-
-#~ msgid "Sources"
-#~ msgstr "Kilder"
-
-#~ msgid "N_ew Directory Server"
-#~ msgstr "Ny katalog-tjener"
-
-#~ msgid "_Actions"
-#~ msgstr "_Handlinger"
-
-#~ msgid "Create a new contact"
-#~ msgstr "Opret en ny kontakt"
-
-#~ msgid "Delete a contact"
-#~ msgstr "Slet en kontakt"
-
-#~ msgid "Find"
-#~ msgstr "Find"
-
-#~ msgid "Find a contact"
-#~ msgstr "Find kontakt"
-
-#~ msgid "New"
-#~ msgstr "Ny"
-
-#~ msgid "Print contacts"
-#~ msgstr "Udskriv kontakt"
-
-#~ msgid "Stop"
-#~ msgstr "Stop"
-
-#~ msgid "Stop Loading"
-#~ msgstr "Stop indlФsning"
-
-#~ msgid "View All"
-#~ msgstr "Vis alle"
-
-#~ msgid "View all contacts"
-#~ msgstr "Vis alle kontakter"
-
-#~ msgid "_Print Contacts..."
-#~ msgstr "_Udskriv kontakter..."
-
-#~ msgid "_Search for contacts"
-#~ msgstr "_SЬg efter kontakter"
-
-#~ msgid "5 Days"
-#~ msgstr "Fem dage"
-
-#~ msgid "Alter preferences"
-#~ msgstr "фndr opsФtning"
-
-#~ msgid "Ca_lendar"
-#~ msgstr "_Kalender"
-
-#~ msgid "Calendar Preferences..."
-#~ msgstr "OpsФtning af kalender"
-
-#~ msgid "Create a new appointment"
-#~ msgstr "Opret en ny aftale"
-
-#~ msgid "Create a new calendar"
-#~ msgstr "Opret en ny kalender"
-
-#~ msgid "Day"
-#~ msgstr "Dag"
-
-#~ msgid "Go back in time"
-#~ msgstr "GЕ tilbage i tiden"
-
-#~ msgid "Go forward in time"
-#~ msgstr "GЕ fremad i tid"
-
-#~ msgid "Go to"
-#~ msgstr "GЕ til"
-
-#~ msgid "Go to a specific date"
-#~ msgstr "GЕ til specifik dato"
-
-#~ msgid "Go to present time"
-#~ msgstr "GЕ til nutiden"
-
-#~ msgid "Month"
-#~ msgstr "MЕned"
-
-#~ msgid "Open a calendar"
-#~ msgstr "еbn en kalender"
-
-#~ msgid "Prev"
-#~ msgstr "Smugkig"
-
-#~ msgid "Print this calendar"
-#~ msgstr "Udskriv denne kalender"
-
-#~ msgid "Save calendar as something else"
-#~ msgstr "Gem kalender som noget andet"
-
-#~ msgid "Show 1 day"
-#~ msgstr "Vis Иn dag"
-
-#~ msgid "Show 1 month"
-#~ msgstr "Vis Иn mЕned"
-
-#~ msgid "Show 1 week"
-#~ msgstr "Vis Иn uge"
-
-#~ msgid "Show the working week"
-#~ msgstr "Vis arbejdsugen"
-
-#~ msgid "Week"
-#~ msgstr "Uge"
-
-#~ msgid "_New"
-#~ msgstr "_Ny"
-
-#~ msgid "_Open Calendar"
-#~ msgstr "_еbn kalender"
-
-#~ msgid "_Print this calendar"
-#~ msgstr "_Udskriv denne kalender"
-
-#~ msgid "_Save Calendar As"
-#~ msgstr "_Gem kalender som"
-
-#~ msgid "Delete this item"
-#~ msgstr "Slet dette punkt"
-
-#~ msgid "Delete..."
-#~ msgstr "Slet..."
-
-#~ msgid "Help"
-#~ msgstr "HjФlp"
-
-#~ msgid "Print En_velope..."
-#~ msgstr "Skriv kuvert..."
-
-#~ msgid "Print this item"
-#~ msgstr "Udskriv denne ting"
-
-#~ msgid "Print..."
-#~ msgstr "Udskriv..."
-
-#~ msgid "Save _As..."
-#~ msgstr "_Gem som..."
-
-#~ msgid "Save and Close"
-#~ msgstr "Gem og luk"
-
-#~ msgid "Save the contact and close the dialog box"
-#~ msgstr "Gem kontakten og luk dialogboksen"
-
-#~ msgid "Se_nd contact to other..."
-#~ msgstr "Send _kontaktperson til andre..."
-
-#~ msgid "See online help"
-#~ msgstr "Se hjФlpetekster"
-
-#~ msgid "_File"
-#~ msgstr "_Fil"
-
-#~ msgid "_Print..."
-#~ msgstr "_Udskriv..."
-
-#~ msgid "_Save"
-#~ msgstr "_Gem"
-
-#~ msgid "About this application"
-#~ msgstr "Om denne applikation"
-
-#~ msgid "About..."
-#~ msgstr "Om..."
-
-#~ msgid "C_lear"
-#~ msgstr "T_Ьm"
-
-#~ msgid "C_ut"
-#~ msgstr "Klip _ud"
-
-#~ msgid "Clear"
-#~ msgstr "TЬm"
-
-#~ msgid "Clear the selection"
-#~ msgstr "TЬm det valgte"
-
-#~ msgid "Close this appointment"
-#~ msgstr "Luk denne aftale"
-
-#~ msgid "Copy"
-#~ msgstr "KopiИr"
-
-#~ msgid "Copy the selection"
-#~ msgstr "KopiИr valget"
-
-#~ msgid "Cut"
-#~ msgstr "Klip ud"
-
-#~ msgid "Cut the selection"
-#~ msgstr "Klip valget ud"
-
-#~ msgid "Dump XML"
-#~ msgstr "Dump XML"
-
-#~ msgid "Dump the UI Xml description"
-#~ msgstr "Dump beskrivelse af grФnsesnittet som XML"
-
-#~ msgid "FIXME: Address _Book..."
-#~ msgstr "Adresse_bog..."
-
-#~ msgid "FIXME: Chec_k Names"
-#~ msgstr "Tje_k navn"
-
-#~ msgid "FIXME: Help"
-#~ msgstr "HjФlp"
-
-#~ msgid "FIXME: In_complete Task"
-#~ msgstr "U_komplet opgave"
-
-#~ msgid "FIXME: Insert File"
-#~ msgstr "IndsФt fil"
-
-#~ msgid "FIXME: Rec_urrence..."
-#~ msgstr "Gentagelse..."
-
-#~ msgid "FIXME: what goes here?"
-#~ msgstr "Hvad skal vФre her?"
-
-#~ msgid "Find Again"
-#~ msgstr "Find igen"
-
-#~ msgid "Find _Again"
-#~ msgstr "Find ig_en"
-
-#~ msgid "Modify the file's properties"
-#~ msgstr "фndr filens egenskaber"
-
-#~ msgid "N_ext"
-#~ msgstr "N_Фste"
+#~ "For lФsning af e-post leveret af det lokale system, og for gemning af e-post "
+#~ "pЕ lokal disk."
 
-#~ msgid "Paste"
-#~ msgstr "IndsФt"
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Kunne ikke Фndre navn pЕ mappe %s til %s: mЕlet eksisterer"
 
-#~ msgid "Paste the clipboard"
-#~ msgstr "IndsФt fra klippebordet"
+#~ msgid "Mbox folders may not be nested."
+#~ msgstr "Mbox-mapper kan ikke vФre rekursive."
 
-#~ msgid "Print S_etup..."
-#~ msgstr "Skriverops_Фtning..."
+#~ msgid "Could not open summary %s"
+#~ msgstr "Kunne ikke Еbne sammendrag %s"
 
-#~ msgid "Print Setup"
-#~ msgstr "SkriveropsФtning"
+#~ msgid "Summary mismatch, aborting sync"
+#~ msgstr "Fejl i sammendrag, afbryder synkronisering"
 
-#~ msgid "Properties"
-#~ msgstr "Egenskaber"
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Fejl i sammendrag, X-Evolution toptekst mangler"
 
-#~ msgid "Redo"
-#~ msgstr "Genopret"
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Kan ikke kopiere data til udfil: %s"
 
-#~ msgid "Redo the undone action"
-#~ msgstr "Genopret fortrudt handling"
+#~ msgid "Could not load or create summary"
+#~ msgstr "Kunne ikke indlФse eller oprette sammendrag"
 
-#~ msgid "Replace"
-#~ msgstr "Erstat"
+#~ msgid "Cannot append message to mh folder: %s"
+#~ msgstr "Kan ikke tilfЬje besked i mh-mappe: %s"
 
-#~ msgid "Replace a string"
-#~ msgstr "Erstat en streng"
+#~ msgid "UNIX MH-format mail directories"
+#~ msgstr "UNIX e-postkataloger i MH-format"
 
-#~ msgid "Save the appointment and close the dialog box"
-#~ msgstr "Gem aftalen og luk dialogboksen"
+#~ msgid "Could not rename folder `%s': %s"
+#~ msgstr "Kunne ikke Фndre navn pЕ mappe `%s': %s"
 
-#~ msgid "Save the current file"
-#~ msgstr "Gem aktiv fil"
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Kunne ikke Фndre navn pЕ mappe `%s': %s eksisterer"
 
-#~ msgid "Schedule Meeting"
-#~ msgstr "PlanlФg mЬde"
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH-mapper kan ikke vФre rekursive."
 
-#~ msgid "Schedule _Meeting"
-#~ msgstr "_PlanlФg mЬde"
+#~ msgid "Local mail directory %s"
+#~ msgstr "Lokal e-postkatalog %s"
 
-#~ msgid "Schedule some sort of a meeting"
-#~ msgstr "OpsФt et eller andet mЬde"
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Kunne ikke oprette rЬr til %s: %s"
 
-#~ msgid "Search again for the same string"
-#~ msgstr "SЬg efter samme streng igen"
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Kunne ikke udfЬre %s: %s\n"
 
-#~ msgid "Search for a string"
-#~ msgstr "SЬg efter en streng"
+#~ msgid "Cannot fork %s: %s"
+#~ msgstr "Kan ikke udfЬre fork pЕ %s: %s"
 
-#~ msgid "Select All"
-#~ msgstr "VФlg alle"
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "Opgavefo_respЬrgsel"
 
-#~ msgid "Select everything"
-#~ msgstr "VФlg alt"
-
-#~ msgid "Setup the page settings for your current printer"
-#~ msgstr "RedigИr sideindstillinger for aktiv skriver"
-
-#~ msgid "Undo"
-#~ msgstr "Fortryd"
-
-#~ msgid "Undo the last action"
-#~ msgstr "Fortryd sidste handling"
-
-#~ msgid "_About..."
-#~ msgstr "_Om..."
-
-#~ msgid "_Close"
-#~ msgstr "L_uk"
-
-#~ msgid "_Copy"
-#~ msgstr "_KopiИr"
-
-#~ msgid "_Debug"
-#~ msgstr "_FejlsЬg"
-
-#~ msgid "_Edit"
-#~ msgstr "_RedigИr"
-
-#~ msgid "_Find..."
-#~ msgstr "_Find..."
-
-#~ msgid "_Help"
-#~ msgstr "_HjФlp"
-
-#~ msgid "_Paste"
-#~ msgstr "_IndsФt"
-
-#~ msgid "_Print"
-#~ msgstr "_Udskriv"
-
-#~ msgid "_Properties..."
-#~ msgstr "Egenska_ber..."
-
-#~ msgid "_Redo"
-#~ msgstr "Genop_ret"
-
-#~ msgid "_Replace..."
-#~ msgstr "E_rstat..."
-
-#~ msgid "_Undo"
-#~ msgstr "_Fortryd"
-
-#~ msgid "Compose"
-#~ msgstr "Skriv"
-
-#~ msgid "Compose a new message"
-#~ msgstr "Skriv en ny meddelelse"
-
-#~ msgid "Copy message to a new folder"
-#~ msgstr "KopiИr meddelelse til en ny mappe"
-
-#~ msgid "F_older"
-#~ msgstr "_Mapper"
-
-#~ msgid "Fi_lter on Sender"
-#~ msgstr "FiltrИr _efter afsender"
-
-#~ msgid "Filter on Rec_ipients"
-#~ msgstr "FiltrИr efter mod_tager"
-
-#~ msgid "Forget _Passwords"
-#~ msgstr "Glem _adgangskoder"
-
-#~ msgid "Get Mail"
-#~ msgstr "Hent post"
-
-#~ msgid "Mail _Filters"
-#~ msgstr "E-post _filtre"
-
-#~ msgid "Manage Subscriptions"
-#~ msgstr "Behandl abonnementer"
-
-#~ msgid "Mar_k As Read"
-#~ msgstr "MФrk som _lФst"
-
-#~ msgid "Mark As U_nread"
+#~ msgid "FIXME: Mark as U_nread"
 #~ msgstr "MФrk som _ulФst"
 
-#~ msgid "Move"
-#~ msgstr "Flyt"
-
-#~ msgid "Move message to a new folder"
-#~ msgstr "Flyt meddelelsen til en ny mappe"
-
-#~ msgid "Previews the message to be printed"
-#~ msgstr "Viser forhЕndsvisning af beskeden som skal udskrives"
-
-#~ msgid "Print Preview of message..."
-#~ msgstr "Udskriv forhЕndsvisning af besked..."
-
-#~ msgid "Print message to the printer"
-#~ msgstr "Udskriv besked til printeren"
-
-#~ msgid "Print message..."
-#~ msgstr "Udskriv besked..."
-
-#~ msgid "Reply to _All"
-#~ msgstr "Svar til _alle"
-
-#~ msgid "Reply to _Sender"
-#~ msgstr "Svar til _afsender"
-
-#~ msgid "Select _All"
-#~ msgstr "VФlg _alle"
-
-#~ msgid "Send queued mail and retrieve new mail"
-#~ msgstr "Afsend kЬet post og modtag ny post"
-
-#~ msgid "Threaded Message list"
-#~ msgstr "TrЕdet meddelelsesliste"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "VFolder for _afsender"
+#~ msgid "FIXME: _New Contact"
+#~ msgstr "_Ny kontaktperson"
 
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "VFolder for _modtagere"
+#~ msgid "FIXME: New _Contact from Same Company"
+#~ msgstr "Ny _Kontaktperson fra samme organisation"
 
-#~ msgid "View Raw Message Source"
-#~ msgstr "Vis rЕ beskedskildetekst"
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "Nyt _brev til kontaktperson"
 
-#~ msgid "_Apply Filters"
-#~ msgstr "_Anvend filtre"
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "Nyt _mЬde med kontakt"
 
-#~ msgid "_Configure Folder"
-#~ msgstr "_KonfigurИr mappe"
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "_PlanlФg et mЬde..."
 
-#~ msgid "_Copy to Folder..."
-#~ msgstr "_KopiИr til mappe..."
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "_Ny _Opgave for kontakt"
 
-#~ msgid "_Edit Message"
-#~ msgstr "_RedigИr besked"
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "Ny _journalopfЬring for kontakt"
 
-#~ msgid "_Expunge"
-#~ msgstr "_Fjern"
+#~ msgid "FIXME: _Flag for Follow Up..."
+#~ msgstr "_Flag for opfЬlgning..."
 
-#~ msgid "_Filter on Subject"
-#~ msgstr "_FiltrИr efter emne"
+#~ msgid "FIXME: _Display Map of Address"
+#~ msgstr "_Vis sammenhФng mellem adresser"
 
-#~ msgid "_Forward"
-#~ msgstr "_Videresend"
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "_еbn netside"
 
-#~ msgid "_Invert Selection"
-#~ msgstr "Re_versИr udvalg"
+#~ msgid "FIXME: Previous"
+#~ msgstr "Forrige"
 
-#~ msgid "_Mail Configuration"
-#~ msgstr "_Epost-konfiguration"
-
-#~ msgid "_Message"
-#~ msgstr "_Besked"
-
-#~ msgid "_Move to Folder..."
-#~ msgstr "_Flyt til mappe..."
-
-#~ msgid "_Open in New Window"
-#~ msgstr "_еbn i nyt vindue"
-
-#~ msgid "_Print Message"
-#~ msgstr "_Udskriv besked"
-
-#~ msgid "_Save Message As..."
-#~ msgstr "_Gem besked som..."
-
-#~ msgid "_Source"
-#~ msgstr "_Kilde"
-
-#~ msgid "_Threaded"
-#~ msgstr "_TrЕdet"
-
-#~ msgid "_Undelete"
-#~ msgstr "_Fortryd sletning"
-
-#~ msgid "_VFolder on Subject"
-#~ msgstr "_VFolder for emne"
-
-#~ msgid "_Virtual Folder Editor"
-#~ msgstr "Redigering af _virtuelle mapper"
-
-#~ msgid "Attach"
-#~ msgstr "VedhФft"
+#~ msgid "FIXME: Next"
+#~ msgstr "_NФste"
 
 #~ msgid "Bold"
 #~ msgstr "Fed"
 
-#~ msgid "Close the current file"
-#~ msgstr "Luk aktiv fil"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "IndsФt en fil som tekst i meddelelsen"
-
-#~ msgid "Insert text file..."
-#~ msgstr "IndsФt tekstfil..."
-
-#~ msgid "Open a file"
-#~ msgstr "еbn en fil"
-
-#~ msgid "Save As"
-#~ msgstr "Gem som"
-
-#~ msgid "Save in _folder... (FIXME)"
-#~ msgstr "Gem i _mappe..."
-
-#~ msgid "Save in folder..."
-#~ msgstr "Gem i mappe..."
-
-#~ msgid "Save the current file with a different name"
-#~ msgstr "Gem den aktive fil med et andet navn"
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Gem meddelelsen i en angivet mappe"
-
-#~ msgid "Send"
-#~ msgstr "Send"
-
-#~ msgid "Send _Later"
-#~ msgstr "Send _senere"
-
-#~ msgid "Send _later"
-#~ msgstr "Send se_nere"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Send meddelser i HTML-format"
-
-#~ msgid "Send the message later"
-#~ msgstr "Send beskeden senere"
-
-#~ msgid "Send the message now"
-#~ msgstr "Send meddelelsen nu"
-
-#~ msgid "Send this message now"
-#~ msgstr "Send denne meddelelse nu"
-
 #~ msgid "Sets something as bold"
 #~ msgstr "SФtter noget til fed"
 
-#~ msgid "Show / hide attachments"
-#~ msgstr "Vis/skjul bilag"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Vis _bilag"
-
-#~ msgid "Show attachments"
-#~ msgstr "Vis bilag"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_IndsФt tekstfil..."
-
-#~ msgid "_Open..."
-#~ msgstr "_еbn..."
-
-#~ msgid "Add folder to your list of subscribed folders"
-#~ msgstr "TilfЬj mappe pЕ listen over abonnerede mapper"
-
-#~ msgid "Refresh List"
-#~ msgstr "LФs listen igen"
-
-#~ msgid "Refresh List of Folders"
-#~ msgstr "LФs mappelisten igen"
-
-#~ msgid "Remove folder from your list of subscribed folders"
-#~ msgstr "Fjern mappe fra din liste over abonnerede mapper"
-
-#~ msgid "Subscribe"
-#~ msgstr "AbonnИr"
-
-#~ msgid "Unsubscribe"
-#~ msgstr "Fjern abonnement"
-
-#~ msgid "Display a different folder"
-#~ msgstr "Vis en anden mappe"
-
-#~ msgid "E_xit"
-#~ msgstr "_Afslut"
-
-#~ msgid "Evolution bar _shortcut"
-#~ msgstr "Evolution bjФlke _genvej"
-
-#~ msgid "Exit the program"
-#~ msgstr "Afslut programmet"
-
-#~ msgid "Getting _Started"
-#~ msgstr "Kom _igang"
-
-#~ msgid "Show information about Evolution"
-#~ msgstr "Vis oplysninger om Evolution"
-
-#~ msgid "Show the _Folder Bar"
-#~ msgstr "Vis mappe_bjФlken"
-
-#~ msgid "Show the _Shortcut Bar"
-#~ msgstr "Vis genvejsbjФlken"
-
-#~ msgid "Submit _Bug Report"
-#~ msgstr "Indsend _fejlrapport"
-
-#~ msgid "Submit bug report using Bug Buddy."
-#~ msgstr "Indsend fejlrapport med Fejl-Frede."
-
-#~ msgid "Toggle whether to show the folder bar"
-#~ msgstr "SlЕ visning af mappelinjen til/fra"
-
-#~ msgid "Toggle whether to show the shortcut bar"
-#~ msgstr "SlЕ visning af genvejslinjen til/fra"
-
-#~ msgid "Using the C_ontact Manager"
-#~ msgstr "Bruger behandleren af kontakter"
-
-#~ msgid "Using the _Calendar"
-#~ msgstr "Brug af kalenderen"
-
-#~ msgid "Using the _Mailer"
-#~ msgstr "Brug af postdelen"
-
-#~ msgid "_About Evolution..."
-#~ msgstr "_Om Evolution..."
-
-#~ msgid "_Appointment (FIXME)"
-#~ msgstr "_Aftale"
-
-#~ msgid "_Contact (FIXME)"
-#~ msgstr "_Kontakt"
-
-#~ msgid "_Folder"
-#~ msgstr "_Mapper"
-
-#~ msgid "_Go to Folder..."
-#~ msgstr "_GЕ til mappe..."
-
-#~ msgid "_Index"
-#~ msgstr "_Indeks"
-
-#~ msgid "_Mail message (FIXME)"
-#~ msgstr "Send _besked"
-
-#~ msgid "_Settings"
-#~ msgstr "_OpsФtning"
-
-#~ msgid "_Task (FIXME)"
-#~ msgstr "Opgave"
-
 #~ msgid "Deleted"
 #~ msgstr "Slettet"
 
diff --git a/po/de.po b/po/de.po
index b5b09d6ca8..e47a001818 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.4\n"
-"POT-Creation-Date: 2000-11-16 20:25+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-11-16 20:33+01:00\n"
 "Last-Translator: Matthias Warkus <mawarkus@gnome.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -304,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:1012
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1092
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Konnte Bonobo nicht initialisieren"
 
@@ -430,28 +430,28 @@ msgstr ""
 "Ein Fehler trat beim dem Versuch auf, die Pilot-\n"
 "Liste vom gnome-pilot-DДmon zu lesen"
 
-#: addressbook/conduit/address-conduit.c:207
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor konnte nicht geladen werden\n"
 
-#: addressbook/conduit/address-conduit.c:220
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EBook nicht geladen\n"
 
-#: addressbook/conduit/address-conduit.c:579
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Konnte den wombat-Server nicht starten"
 
-#: addressbook/conduit/address-conduit.c:580
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Konnte wombat nicht starten"
 
-#: addressbook/conduit/address-conduit.c:613
 #: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "Konnte Address-Anwendungsblock des Pilot nicht lesen"
 
@@ -472,105 +472,11 @@ msgstr "Eintrag/EintrДge gehЖrt/gehЖren zu diesen Kategorien:"
 msgid "Available Categories:"
 msgstr "VerfЭgbare Kategorien:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "GeschДftlich"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "GeschДftlich 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr "GeschДftliches Fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr "RЭckruf"
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "Zu Hause"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "Zu Hause 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr "Fax zu Hause"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: mail/mail-config.glade.h:18
-msgid "Other"
-msgstr "Andere"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "Anderes Fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr "PrimДr"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr "TTY/TTD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "PrimДre E-Mail"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "E-Mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "E-Mail 3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Kontakt lЖschen?"
 
@@ -584,7 +490,7 @@ msgid "_Add"
 msgstr "HinzufЭgen"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "LЖschen"
 
@@ -599,12 +505,11 @@ msgstr "Neuer Telefon-Typ"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:53 filter/filter.glade.h:7
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:7
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "HinzufЭgen"
 
@@ -644,6 +549,11 @@ msgstr "GeschДftliches Fax"
 msgid "_Mobile"
 msgstr "Mobil"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "PrimДre E-Mail"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "GeschДftlich"
@@ -657,7 +567,7 @@ msgid "C_ontacts..."
 msgstr "Kontakte..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Kategorien..."
 
@@ -674,7 +584,7 @@ msgid "_Address..."
 msgstr "Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Allgemein"
 
@@ -719,44 +629,145 @@ msgid "No_tes:"
 msgstr "Notizen:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Details"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "GeschДftlich"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "GeschДftlich 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "GeschДftliches Fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "RЭckruf"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Auto"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Zu Hause"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Zu Hause 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Fax zu Hause"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Andere"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Anderes Fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "PrimДr"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TTD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E-Mail 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E-Mail 3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Adresse _2"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:7
+#, fuzzy
+msgid "Canada"
+msgstr "Kalender"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Adresse prЭfen"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "Land:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:10
+#, fuzzy
+msgid "Finland"
+msgstr "Suchen"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "Ort:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Postfach:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Staat/Bundesland:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:14
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "Postleitzahl/_ZIP:"
 
@@ -819,25 +830,25 @@ msgstr "Nachname:"
 msgid "_Suffix:"
 msgstr "Suffix:"
 
-#: addressbook/gui/component/addressbook.c:266
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Als _Minikarten"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:272
-#: ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Als Tabelle"
 
-#: addressbook/gui/component/addressbook.c:392
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Kann das Adressbuch nicht Жffnen"
 
-#: addressbook/gui/component/addressbook.c:397
+#: addressbook/gui/component/addressbook.c:391
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -846,7 +857,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Wir haben dieses Adressbuch nicht Жffnen kЖnnen. Dies\n"
 "heiъt entweder, dass Sie einen ungЭltigen URI eingegeben\n"
@@ -859,27 +870,27 @@ msgstr ""
 "mЭssen Sie OpenLDAP herunterladen, installieren, und\n"
 "Evolution neu compilieren und installieren.\n"
 
-#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 msgid "Show All"
 msgstr "Alle anzeigen"
 
-#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr "Komplex..."
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:533
 msgid "Any field contains"
 msgstr "Irgend ein Feld enthДlt"
 
-#: addressbook/gui/component/addressbook.c:540
+#: addressbook/gui/component/addressbook.c:534
 msgid "Name contains"
 msgstr "Name enthДlt"
 
-#: addressbook/gui/component/addressbook.c:541
+#: addressbook/gui/component/addressbook.c:535
 msgid "Email contains"
 msgstr "E-Mail enthДlt"
 
-#: addressbook/gui/component/addressbook.c:627
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "Die URI, die der Suchdienst anzeigen wird"
 
@@ -889,66 +900,180 @@ msgstr "Externe Verzeichnisse"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "LDAP-Server:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-#: mail/mail-config-druid.glade.h:37
+#: po/tmp/ldap-server-dialog.glade.h:8
 msgid "Name:"
 msgstr "Name:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Portnummer:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr "Root-DN:"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Suchen..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "NachrichtenempfДnger"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Namen wДhlen"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Name aus Liste wДhlen:"
 
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Suchen"
+
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "window2"
-msgstr "windows2"
+#: po/tmp/alphabet.glade.h:7
+#, fuzzy
+msgid "a"
+msgstr "AM"
+
+#: po/tmp/alphabet.glade.h:8
+msgid "b"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:9
+msgid "c"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:10
+msgid "d"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:11
+#, fuzzy
+msgid "e"
+msgstr "Mi"
+
+#: po/tmp/alphabet.glade.h:12
+#, fuzzy
+msgid "f"
+msgstr "Wenn"
+
+#: po/tmp/alphabet.glade.h:13
+msgid "g"
+msgstr ""
+
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+msgid "h"
+msgstr "h"
+
+#: po/tmp/alphabet.glade.h:15
+#, fuzzy
+msgid "i"
+msgstr "ist"
+
+#: po/tmp/alphabet.glade.h:16
+msgid "j"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:17
+#, fuzzy
+msgid "k"
+msgstr "OK"
+
+#: po/tmp/alphabet.glade.h:18
+msgid "l"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:19
+#, fuzzy
+msgid "m"
+msgstr "AM"
+
+#: po/tmp/alphabet.glade.h:20
+#, fuzzy
+msgid "n"
+msgstr "bei"
+
+#: po/tmp/alphabet.glade.h:21
+#, fuzzy
+msgid "o"
+msgstr "bei"
+
+#: po/tmp/alphabet.glade.h:22
+#, fuzzy
+msgid "p"
+msgstr "PM"
+
+#: po/tmp/alphabet.glade.h:23
+msgid "q"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:24
+#, fuzzy
+msgid "r"
+msgstr "Fr"
+
+#: po/tmp/alphabet.glade.h:25
+#, fuzzy
+msgid "s"
+msgstr "ist"
+
+#: po/tmp/alphabet.glade.h:26
+#, fuzzy
+msgid "t"
+msgstr "."
+
+#: po/tmp/alphabet.glade.h:27
+#, fuzzy
+msgid "u"
+msgstr "So"
+
+#: po/tmp/alphabet.glade.h:28
+msgid "v"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:29
+msgid "w"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:30
+msgid "x"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: po/tmp/alphabet.glade.h:31
+msgid "y"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:32
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Als VCard speichern"
@@ -971,197 +1096,190 @@ msgstr ""
 "\n"
 "Doppelklicken Sie hier, um einen neuen Kontakt anzulegen."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Suchen"
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
+#: po/tmp/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 Punkt Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: po/tmp/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 Punkt Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: po/tmp/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr "Leere Formulare am Ende:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: po/tmp/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "TextkЖrper"
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: po/tmp/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Unten:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: po/tmp/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Ausmaъe:"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: po/tmp/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Schrifart..."
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Schrifarten"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: po/tmp/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Fuъzeile:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: po/tmp/e-contact-print.glade.h:15
 msgid "Format"
 msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: po/tmp/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "Kopfzeile"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: po/tmp/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "Kopf-/Fuъzeile"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "эberschriften"
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: po/tmp/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "эberschriften fЭr jeden Buchstaben"
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: po/tmp/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "HЖhe:"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr "Folgen einander unmittelbar"
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: po/tmp/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr "Dazunehmen:"
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: po/tmp/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Querformat"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: po/tmp/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Links:"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: po/tmp/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "Buchstabenreiter an der Seite"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: po/tmp/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "RДnder"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: po/tmp/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Anzahl Spalten:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: po/tmp/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Optionen"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: po/tmp/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: po/tmp/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Seite"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: po/tmp/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Seite einrichten:"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: po/tmp/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papier"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Papierquelle:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Hochformat"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: po/tmp/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Vorschau:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: po/tmp/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr "Mit grauer Schattierung drucken"
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: po/tmp/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Auf geraden Seiten umkehren"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Rechts:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Abschnitte:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: po/tmp/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Schattierung"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "GrЖъe:"
 
-#: addressbook/printing/e-contact-print.glade.h:43
+#: po/tmp/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Auf einer neuen Seite beginnen"
 
-#: addressbook/printing/e-contact-print.glade.h:44
+#: po/tmp/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Stilname:"
 
-#: addressbook/printing/e-contact-print.glade.h:45
+#: po/tmp/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "Oben:"
 
-#: addressbook/printing/e-contact-print.glade.h:46
-#: mail/mail-config-druid.glade.h:66
+#: po/tmp/e-contact-print.glade.h:45
 msgid "Type:"
 msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
+#: po/tmp/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Breite:"
 
-#: addressbook/printing/e-contact-print.glade.h:48
+#: po/tmp/e-contact-print.glade.h:47
 msgid "label26"
 msgstr "label26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "AM"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "PM"
 
-#: calendar/cal-util/timeutil.c:100
-msgid "h"
-msgstr "h"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr "Evolution-Kalender-Verbindung"
@@ -1170,13 +1288,13 @@ msgstr "Evolution-Kalender-Verbindung"
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "Konfigurationswerkzeug fЭr die Evolution-Kalender-Verbindung.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Fehler bei der Kommunikation mit dem Kalender-Server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Konnte Calendar-Anwendungsblock des Pilot nicht lesen"
 
@@ -1188,8 +1306,8 @@ msgstr "Evolution-ToDo-Verbindung"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Konfigurationswerkzeug fЭr die Evolution-ToDo-Verbindung.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "Konnte den ToDo-Anwendungsblock des Pilot nicht lesen"
 
@@ -1233,46 +1351,46 @@ msgstr "Heute fДlliger To-Do-Eintrag:"
 msgid "To-Do item that is overdue:"
 msgstr "эberfДlliger To-Do-Eintrag:"
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Kalender Жffnen"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Kalender speichern"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "жffentlich"
 
-#: calendar/gui/calendar-model.c:347
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:350
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Vertraulich"
 
@@ -1304,7 +1422,7 @@ msgstr "Transparent"
 msgid "Opaque"
 msgstr "Opak"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1316,36 +1434,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr "%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:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H.%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1355,15 +1472,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Der Prozentwert muss zwischen 0 und 100 (einschlieъlich) sein"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Die PrioritДt muss zwischen 1 und 9 (einschlieъlich) sein"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "Der URI, den der Kalender anzeigen wird"
 
@@ -1381,382 +1498,469 @@ msgstr "Keine Zusammenfassung verfЭgbar."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:10 ui/evolution-subscribe.xml.h:8
+#: 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
 msgid "Close"
 msgstr "Schlieъen"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9 calendar/gui/gnome-cal.c:1466
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr "Weiterschlafen"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Weiterschlaf-Zeit (Minuten)"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: po/tmp/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "05 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "10 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12 Stunden (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: po/tmp/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "15 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24 Stunden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: po/tmp/cal-prefs-dialog.glade.h:11
+#, fuzzy
+msgid "30 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "60 minutes"
+msgstr "Minuten"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr "Alarme schweigen nach"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: po/tmp/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Audio-Alarme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: po/tmp/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "Piepsen, wenn Alarmfenster erscheinen."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: po/tmp/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Kalender-Einstellungen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 calendar/gui/prop.c:528
+#: po/tmp/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Farben"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: po/tmp/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Wochenenden komprimieren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Optionen zum Datumsnavigator"
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:842
+#: po/tmp/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Voreinstellungen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Anzeigeoptionen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 calendar/gui/prop.c:610
+#: po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "FДllig am"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: po/tmp/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr "Weiterschlafen aktivieren fЭr "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: po/tmp/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Ende des Tages:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: po/tmp/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Erster Tag der Woche:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/gnome-month-item.c:741
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
 msgid "Fri"
 msgstr "Fr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Freitag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Markieren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "Heute fДllige EintrДge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr "Heute fДllige EintrДge:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: po/tmp/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "Noch nicht fДllige EintrДge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "Noch nicht fДllige EintrДge:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
 msgid "Mon"
 msgstr "Mo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Montag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr "эberfДllige EintrДge"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "эberfДllige EintrДge:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: po/tmp/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "Eine Farbe auswДhlen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "PrioritДt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Mich an alle Termine erinnern,"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: po/tmp/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr "Erinnerungen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/gnome-month-item.c:742
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
 msgid "Sat"
 msgstr "Sa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Samstag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr "Anzeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Endzeiten von Terminen anzeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: po/tmp/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Wochennummern zeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: po/tmp/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Anfang des Tages:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/gnome-month-item.c:736
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
 msgid "Sun"
 msgstr "So"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Auftragsblock"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:740
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
 msgid "Thu"
 msgstr "Do"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:612
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr "Zeit bis FДlligkeit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: po/tmp/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "Zeit-Unterteilungen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: po/tmp/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/gnome-month-item.c:738
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
 msgid "Tue"
 msgstr "Di"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Visuelle Alarme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/gnome-month-item.c:739
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
 msgid "Wed"
 msgstr "Mi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "Arbeitswoche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: po/tmp/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "Minuten bevor sie auftreten."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "Sekunden."
 
-#: calendar/gui/dialogs/task-editor.c:655
-msgid "Edit Task"
-msgstr "Auftrag bearbeiten"
-
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:316
-msgid "No summary"
-msgstr "Keine Zusammenfassung"
-
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:322
-#, c-format
-msgid "Appointment - %s"
-msgstr "Termin - %s"
-
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:325
-#, c-format
-msgid "Task - %s"
-msgstr "Auftrag - %s"
-
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:328
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Journal-Eintrag  - %s"
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% abgeschlossen:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: po/tmp/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr "Klassifikation:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: po/tmp/task-editor-dialog.glade.h:9
+#, fuzzy
+msgid "Cancelled"
+msgstr "Abbrechen"
+
+#: po/tmp/task-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Completed"
+msgstr "% abgeschlossen:"
+
+#: po/tmp/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Abgeschlossen am:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: po/tmp/task-editor-dialog.glade.h:14
+#, fuzzy
+msgid "High"
+msgstr "HЖhe:"
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Low"
+msgstr "jetzt"
+
+#. 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
+msgid "None"
+msgstr "Keine"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Normal"
+msgstr "Format"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Not Started"
+msgstr "Erste Schritte"
+
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "Zusammenfassung"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Auftrag"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: po/tmp/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "Kontakte..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: po/tmp/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr "FДllig am:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_PrioritДt:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "Status:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
-#: calendar/gui/e-calendar-table.c:294
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Auftrag bearbeiten"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Keine Zusammenfassung"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Termin - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Auftrag - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Journal-Eintrag  - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "жffnen..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Den Auftrag Жffnen"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Den Auftrag als abgeschlossen markieren"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:55 filter/filter.glade.h:8
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:476
-#: mail/mail-config-druid.glade.h:23 mail/mail-config.glade.h:9
-#: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
+#: 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 "LЖschen"
 
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Diesen Auftrag lЖschen"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i Minuten-Unterteilungen"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A, %d. %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1187
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a, %d. %b"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1200
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: calendar/gui/e-day-view.c:2631 calendar/gui/e-day-view.c:2638
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2930
-#: calendar/gui/e-week-view.c:2937 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c: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
 msgid "New appointment..."
 msgstr "Neuer Termin..."
 
-#: calendar/gui/e-day-view.c:2635 calendar/gui/e-day-view.c:2642
-#: calendar/gui/e-week-view.c:2934 calendar/gui/e-week-view.c:2941
+#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
+#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
 msgid "Edit this appointment..."
 msgstr "Diesen Termin bearbeiten..."
 
-#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
-#: ui/evolution-event-editor.xml.h:21
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Diesen Termin lЖschen"
 
-#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Diesen Termin beweglich machen"
 
-#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Dieses Auftreten lЖschen"
 
-#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Jedes Auftreten lЖschen"
 
@@ -1767,252 +1971,201 @@ msgstr "Jedes Auftreten lЖschen"
 msgid "%d %B"
 msgstr "%d. %B"
 
-#: calendar/gui/event-editor.c:310
-msgid "Edit Appointment"
-msgstr "Termin bearbeiten"
+#.
+#. * 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
+msgid "A_ll day event"
+msgstr "GanztДgiges Ereignis"
 
-#: calendar/gui/event-editor.c:365
-msgid "on"
-msgstr "bei"
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "Termin-Grundeinstellungen"
 
-#: calendar/gui/event-editor.c:389 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "Tag"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "Klassifikation"
 
-#: calendar/gui/event-editor.c:390 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Montag"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "Benutzerdefinierte Wiederholung"
 
-#: calendar/gui/event-editor.c:391
-msgid "Tuesday"
-msgstr "Dienstag"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Tage"
 
-#: calendar/gui/event-editor.c:392
-msgid "Wednesday"
-msgstr "Mittwoch"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Alle"
 
-#: calendar/gui/event-editor.c:393
-msgid "Thursday"
-msgstr "Donnerstag"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Ausnahmen"
 
-#: calendar/gui/event-editor.c:394
-msgid "Friday"
-msgstr "Freitag"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "Stunden"
 
-#: calendar/gui/event-editor.c:395
-msgid "Saturday"
-msgstr "Samstag"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Mail an:"
 
-#: calendar/gui/event-editor.c:396 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Sonntag"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minuten"
 
-#: calendar/gui/event-editor.c:514
-msgid "on the"
-msgstr "am"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "дndern"
 
-#: calendar/gui/event-editor.c:521
-msgid "th"
-msgstr "."
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Keine Wiederholung"
 
-#: calendar/gui/event-editor.c:675
-msgid "occurrences"
-msgstr "Auftreten"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
+msgstr "Vorschau"
 
-#: calendar/gui/event-editor.c:792
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
-"Dieser Termin enthДlt Wiederholungsregeln, die Evolution nicht bearbeiten "
-"kann."
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Privat"
 
-#: calendar/gui/event-editor.c:2820 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a, %d. %b %Y"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "жffentlich"
 
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "Wiederholung"
+
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr "Wiederholungsregel"
+
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr "Erinnerung"
+
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr "Einfache Wiederholung"
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:38
+#: po/tmp/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Zusammenfassung:"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
+#: po/tmp/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Zeit"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "Anfangszeit:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "Endzeit:"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
-msgstr "GanztДgiges Ereignis"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Klassifikation"
-
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "жffentlich"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Privat"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "Audio"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: po/tmp/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "Vertraulich"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minuten"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Hours"
-msgstr "Stunden"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "Tage"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: po/tmp/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "Anzeige"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr "_Programm"
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "Endzeit:"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
+#: po/tmp/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "Mail"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
-msgstr "Mail an:"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Programm"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
+#: po/tmp/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "Programm ausfЭhren:"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "Audio"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "Reminder"
-msgstr "Erinnerung"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "Appointment Basics"
-msgstr "Termin-Grundeinstellungen"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "Anfangszeit:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Anfangsdatum:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "Recurrence Rule"
-msgstr "Wiederholungsregel"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "Tag(e)"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "No recurrence"
-msgstr "Keine Wiederholung"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "event-editor-dialog"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "Simple recurrence"
-msgstr "Einfache Wiederholung"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
+msgstr "fЭr"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Custom recurrence"
-msgstr "Benutzerdefinierte Wiederholung"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr "fЭr immer"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Every"
-msgstr "Alle"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "day(s)"
-msgstr "Tag(e)"
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "Monat(e)"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "bis"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "Woche(n)"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "month(s)"
-msgstr "Monat(e)"
-
-#: calendar/gui/event-editor-dialog.glade.h:48
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "Jahr(e)"
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "for"
-msgstr "fЭr"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Termin bearbeiten"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "until"
-msgstr "bis"
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "bei"
 
-#: calendar/gui/event-editor-dialog.glade.h:51
-msgid "forever"
-msgstr "fЭr immer"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "Tag"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "Exceptions"
-msgstr "Ausnahmen"
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr "am"
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-msgid "Modify"
-msgstr "дndern"
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr "."
 
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "Auftreten"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-msgid "Preview"
-msgstr "Vorschau"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"Dieser Termin enthДlt Wiederholungsregeln, die Evolution nicht bearbeiten "
+"kann."
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence"
-msgstr "Wiederholung"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a, %d. %b %Y"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2224,30 +2377,6 @@ msgstr "zwЖlfter"
 msgid "ago"
 msgstr "her"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "To-Do-Eintrag erzeugen"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "To-Do-Eintrag bearbeiten"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Zusammenfassung:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "FДllig am:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "PrioritДt:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "Kommentar zum Eintrag:"
-
 #: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
 #: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
@@ -2486,192 +2615,95 @@ msgstr "Aktuelles Jahr (%Y)"
 msgid "Print Calendar"
 msgstr "Kalender drucken"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:873
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "Zeitanzeige"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Zeitformat"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 Stunden (AM/PM)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 Stunden"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "Wochen beginnen mit"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Tagesbereich"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"Bitte wДhlen Sie den Anfang und das Ende des\n"
-"Stundenbereichs, der in der Tages- und\n"
-"Wochenansicht dargestellt werden soll. Zeiten\n"
-"auъerhalb dieses Bereichs werden normalerweise\n"
-"nicht dargestellt."
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "Tagesbeginn:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "Tagesende:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "Farben fЭr Anzeige"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "Auf To-Do-Liste zeigen:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "Stiloptionen der To-Do-Liste:"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "эberfДllige EintrДge markieren"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "Noch nicht fДllige EintrДge markieren"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "Heute fДllig EintrДge markieren"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "Eigenschaften der To-Do-Liste"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "To-Do-Liste"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarme"
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "Alarm-Eigenschaften"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "Bei angezeigtem Alarm piepsen"
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "Audio-Alarme schweigen nach"
-
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " Sekunden"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "Weiterschlafen aktivieren fЭr "
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MDMDFSS"
 
-#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "SMDMDFS"
 
-#: camel/camel-movemail.c:97
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Maildatei %s konnte nicht ЭberprЭft werden: %s"
-
-#: camel/camel-movemail.c:134 camel/camel-movemail.c:181
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Lockdatei fЭr %s konnte nicht angelegt werden: %s"
 
-#: camel/camel-movemail.c:144
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"ZeitЭberschreitung beim Versuch, eine Lockdatei auf %s zu erhalten. "
+"Versuchen Sie es spДter noch einmal."
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Maildatei %s konnte nicht ЭberprЭft werden: %s"
+
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Maildatei %s konnte nicht geЖffnet werden: %s"
 
-#: camel/camel-movemail.c:154
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "TemporДre Maildatei %s konnte nicht geЖffnet werden: %s"
 
-#: camel/camel-movemail.c:195
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Lockdatei fЭr %s konnte nicht getestet werden: %s"
 
-#: camel/camel-movemail.c:215
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"ZeitЭberschreitung beim Versuch, eine Lockdatei auf %s zu erhalten. "
-"Versuchen Sie es spДter noch einmal."
-
-#: camel/camel-movemail.c:241
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Fehler beim Lesen der Maildatei: %s"
 
-#: camel/camel-movemail.c:252
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Fehler beim Schreiben der temporДren Maildatei: %s"
 
-#: camel/camel-movemail.c:270
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Mail konnte nicht in temporДrer Datei %s gespeichert werden: %s"
 
-#: camel/camel-movemail.c:302
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Pipe konnte nicht angelegt werden: %s"
 
-#: camel/camel-movemail.c:314
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "forK() konnte nicht durchgefЭhrt werden: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail-Programm fehlgeschlagen: %s"
 
-#: camel/camel-movemail.c:353
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Unbekannter Fehler)"
 
@@ -2704,6 +2736,10 @@ msgstr "Verbindung zu %s (Port %d) konnte nicht hergestellt werden: %s"
 msgid "(unknown host)"
 msgstr "(unbekannter Rechner)"
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -2719,22 +2755,22 @@ msgstr "URL '%s' braucht einen Rechnernamen-Teil"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%ss' braucht einen Pfad-Teil"
 
-#: camel/camel-service.c:486
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr "Rechner %s gibt es nicht."
 
-#: camel/camel-service.c:489
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Momentan ist es nicht mЖglich, Rechername %s aufzulЖsen."
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Keine Quelle fЭr Protokoll `%s' verfЭgbar"
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2758,6 +2794,18 @@ msgstr "URL-Zeichenkette `%s' enthДlt ein ungЭltiges Protokoll"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer in URL `%s' ist nicht numerisch"
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "Pipe konnte nicht angelegt werden: %s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Unerwartete Antwort von IMAP-Server: %s"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2768,16 +2816,21 @@ msgstr "Unerwartete Antwort von IMAP-Server: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-Befehl fehlgeschlagen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+#, fuzzy
+msgid "Server response ended too soon."
+msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "Antwort des IMAP-Servers enthielt keine %s-Information"
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
@@ -2787,7 +2840,7 @@ msgstr "Unerwartete OK-Antwort von IMAP-Server: %s"
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung fЭr %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -2843,50 +2896,201 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "Zusammenfassung konnte nicht erzeugt werden"
+#: camel/providers/local/camel-local-provider.c:36
+#, fuzzy
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "Mailverzeichnisse im UNIX-MH-Format"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
+
+#: camel/providers/local/camel-local-provider.c:47
+#, fuzzy
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX-Maildateien im mbox-Format"
+
+#: camel/providers/local/camel-local-provider.c:48
+#, fuzzy
+msgid "For storing local mail in standard mbox format"
+msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+#, fuzzy
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Nachricht kann nicht an mbox-Datei angehДngt werden: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "`%s' ist keine regulДre Datei."
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Kann %s nicht forken: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+#, fuzzy
+msgid "Local folders may not be nested."
+msgstr "Mbox-Ordner kЖnnen nicht geschachtelt werden."
+
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Nachricht kann nicht abgerufen werden: %s"
+msgid "Local mail file %s"
+msgstr "Lokale Maildatei %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX-Maildateien im mbox-Format"
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Ordner `%s' konnte nicht umbenannt werden: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Ordner `%s' konnte nicht gelЖscht werden: %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Ordner `%s' konnte nicht gelЖscht werden: %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "Nachricht kann nicht an mh-Ordner angehДngt werden: %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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"Zum Lesen von Mail, die vom lokalen System geliefert wird, und zum Speichern "
-"von Mail auf einer lokalen Platte."
+"Nachricht kann nicht erhalten werden: %s\n"
+"  %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#, fuzzy
+msgid "No such message"
+msgstr "Rechner %s gibt es nicht."
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+#, fuzzy
+msgid "Invalid message contents"
+msgstr "_Nachricht an Kontakt senden..."
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Datei `%s' konnte nicht geЖffnet werden:\n"
+"Ordner `%s' konnte nicht geЖffnet werden:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Ordner `%s' existiert nicht."
 
-#: camel/providers/mbox/camel-mbox-store.c:134
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Ordner `%s' konnte nicht angelegt werden:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' ist kein Verzeichnis."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Ordner `%s' konnte nicht gelЖscht werden: %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Lokales Mailverzeichnis %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "TemporДre Mailbox konnte nicht angelegt werden: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, fuzzy, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Nachricht kann nicht an mbox-Datei angehДngt werden: %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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Nachricht kann nicht erhalten werden: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Datei `%s' konnte nicht geЖffnet werden:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2895,14 +3099,14 @@ msgstr ""
 "Datei `%s' konnte nicht angelegt werden:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ist keine regulДre Datei."
 
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2911,151 +3115,90 @@ msgstr ""
 "Ordner `%s' konnte nicht gelЖscht werden:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Ordner `%s' ist nicht leer. Nicht gelЖscht."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Ordner %s konnte nicht in %s umbenannt werden: Ziel existiert"
-
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox-Ordner kЖnnen nicht geschachtelt werden."
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+"Ordner konnte nicht geЖffnet werden: Nachrichtenliste war unvollstДndig."
 
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Local mail file %s"
-msgstr "Lokale Maildatei %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
-#, c-format
-msgid "Could not open summary %s"
-msgstr "Zusammenfassung %s konnte nicht geЖffnet werden"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Kann %s nicht forken: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:688
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+"Ordner `%s' konnte nicht geЖffnet werden:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "TemporДre Mailbox konnte nicht angelegt werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
+#: 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
+#, fuzzy
+msgid "Summary and folder mismatch, even after a sync"
 msgstr "Zusammenfassungs-PrЭffehler, Synchronisation wird abgebrochen"
 
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Zusammenfassungs-PrЭffehler, X-Evolution-Kopfzeile fehlt"
-
-#: camel/providers/mbox/camel-mbox-summary.c:776
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fehler beim Schreiben auf temporДre Mailbox: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Daten kЖnnen nicht in Ausgabedatei kopiert werden: %s"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Fehler beim Schreiben auf temporДre Mailbox: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:832
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Quellordner %s konnte nicht geschlossen werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:841
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "TemporДrer Ordner konnte nicht geschlossen werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:849
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ordner konnte nicht umbenannt werden: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:861
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Unbekannter Fehler: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "Zusammenfassung konnte nicht erzeugt oder geladen werden"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nachricht kann nicht an mh-Ordner angehДngt werden: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Nachricht kann nicht erhalten werden: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "Mailverzeichnisse im UNIX-MH-Format"
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Zum Speichern lokaler Mail in Mailverzeichnissen im MH-Format"
-
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner `%s' konnte nicht geЖffnet werden:\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:127
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Ordner `%s' konnte nicht angelegt werden:\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:136
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ist kein Verzeichnis."
 
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Ordner `%s' konnte nicht gelЖscht werden: %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Ordner `%s' konnte nicht umbenannt werden: %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Ordner `%s' konnte nicht umbenannt werden: %s existiert"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH-Ordner kЖnnen nicht geschachtelt werden."
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Lokales Mailverzeichnis %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3073,7 +3216,7 @@ msgstr "Benutzername konnte nicht an Server gesendet werden"
 msgid "Server rejected username/password"
 msgstr "Server lehnte Benutzername/Passwort ab"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Nachricht %s nicht gefunden."
@@ -3126,17 +3269,17 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ".newsrc-Datei fЭr %s konnte nicht geЖffnet oder erstellt werden: %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Ordner konnte nicht geЖffnet werden: Nachrichtenliste war unvollstДndig."
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr "Keine Nachricht mit UID %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nachricht konnte nicht vom POP-Server %s abgerufen werden: %s"
@@ -3225,7 +3368,7 @@ msgstr ""
 "Verbindung mit POP-Server konnte nicht hergestellt werden.\n"
 "Fehler beim Senden des Passworts: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ordner `%s' gibt es nicht."
@@ -3317,51 +3460,50 @@ msgid "%.1fG"
 msgstr "%.1f GB"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "anlage"
 
-#: composer/e-msg-composer-attachment-bar.c:397
-#: ui/evolution-message-composer.xml.h:8
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Eine Datei beilegen"
 
-#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:13
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Entfernen"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Entferne das gewДhlte Element aus der Anlagenliste"
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Anlage hinzufЭgen..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Eine Datei zu der Nachricht hinzufЭgen"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Anlagen-Eigenschaften"
 
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Dateiname:"
 
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME-Typ:"
 
 #: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:599
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "Von:"
 
@@ -3373,7 +3515,7 @@ msgstr "FЭr das Adressbuch hier klicken"
 msgid "Enter the identity you wish to send this message from"
 msgstr "Geben Sie die IdentitДt ein, mit der Sie diese Nachricht senden wollen"
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:603
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "An:"
 
@@ -3381,7 +3523,7 @@ msgstr "An:"
 msgid "Enter the recipients of the message"
 msgstr "Gebe die EmpfДnger der Nachricht ein"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -3401,7 +3543,7 @@ msgstr ""
 "Gebe die Adressen ein, die eine Kopie erhalten, dienicht in der "
 "EmpfДngerliste auftaucht."
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Betreff:"
 
@@ -3409,7 +3551,7 @@ msgstr "Betreff:"
 msgid "Enter the subject of the mail"
 msgstr "Gebe den Betreff der Nachricht an"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3418,38 +3560,38 @@ msgstr ""
 "Signaturdatei %s konnte nicht geЖffnet werden:\n"
 "%s"
 
-#: composer/e-msg-composer.c:595
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: composer/e-msg-composer.c:606
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fehler beim Speichern der Datei: %s"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fehler beim Laden der Datei: %s"
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Speichere дnderungen an Nachricht..."
 
-#: composer/e-msg-composer.c:650
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "дnderungen an Nachricht speichern..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fehler beim Speichern des Erstellen in 'EntwЭrfe': %s"
 
-#: composer/e-msg-composer.c:735 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:741
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3459,27 +3601,27 @@ msgstr ""
 "\n"
 "Wollen Sie Ihre дnderungen speichern?"
 
-#: composer/e-msg-composer.c:763
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Datei Жffnen"
 
-#: composer/e-msg-composer.c:889
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Diese Datei existiert nicht."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Diese Datei ist keine normale Datei."
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Diese Datei existiert, ist aber nicht lesbar."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Diese Datei scheint lesbar zu sein, aber open(2) schlug fehl."
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3487,15 +3629,15 @@ msgstr ""
 "Diese Datei ist sehr groъ (mehr als 100 kB).\n"
 "Sind Sie sicher, dass Sie sie einfЭgen wollen?"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Ein Fehler trat beim Lesen der Datei auf."
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Eine Nachricht erstellen"
 
-#: composer/e-msg-composer.c:1416
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Konnte Erstellungsfenster nicht erzeugen."
 
@@ -3503,6 +3645,11 @@ msgstr "Konnte Erstellungsfenster nicht erzeugen."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolutions Maileditor kann nicht initialisiert werden."
 
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Suchen"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "Jahre"
@@ -3589,8 +3736,8 @@ msgstr "Vergleichen mit"
 msgid "<click here to select a date>"
 msgstr "<hier klicken, um ein Datum zu wДhlen>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufЭgen"
 
@@ -3598,7 +3745,16 @@ msgstr "Filterregel hinzufЭgen"
 msgid "Edit Filter Rule"
 msgstr "Filterregel bearbeiten"
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:10
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Filter bearbeiten"
 
@@ -3624,19 +3780,19 @@ msgstr ""
 "Bitte gehen Sie zurЭck und wДhlen Sie einen gЭltigen Ordner zum Ausliefern "
 "der Mail."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Ordner wДhlen"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Ordner-URI eingeben"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<hier klicken, um einen Ordner zu wДhlen>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3645,7 +3801,12 @@ msgstr ""
 "Fehler im regulДren Ausdruck '%s':\n"
 "%s"
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Test"
 
@@ -3657,229 +3818,225 @@ msgstr "Regelname: "
 msgid "Untitled"
 msgstr "Namenlos"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Wenn"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Aktionen ausfЭhren"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "wenn alle Kriterien zutreffen"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "wenn irgendwelche Kriterien zutreffen"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Kriterium hinzufЭgen"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Kriterium entfernen"
 
-#: filter/filter.glade.h:9 mail/folder-browser.c:463
-#: mail/mail-config-druid.glade.h:26 mail/mail-config.glade.h:10
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: filter/filter.glade.h:11
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "VOrdner bearbeiten"
 
-#: filter/filter.glade.h:12
+#: po/tmp/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Filterregeln"
 
-#: filter/filter.glade.h:14
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "Umrandung:"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtuelle Ordner"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "vOrdner-Quellen"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:511
-msgid "Answered"
-msgstr "Beantwortet"
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Farbe zuweisen"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Bewertung zuweisen"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "In Ordner kopieren"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Empfangsdatum"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Sendedatum"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "GelЖscht"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr "Entwurf"
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "Ausdruck"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr "Markiert"
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "Weiterleiten an Adresse"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Nachrichtenrumpf"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Nachrichtenrumpf"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Nachricht wurde empfangen"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Nachricht wurde gesendet"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "In Ordner verschieben"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "EmpfДnger"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:508
-msgid "Seen"
-msgstr "Gelesen"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Absender"
 
-#: filter/libfilter-i18n.h:24
-msgid "Set Flag"
-msgstr "Marke setzen"
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Status:"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Quelle"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Bestimmte Kopfzeile"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "Status:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Verarbeitung abbrechen"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Betreff"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "nach"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "vor"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "enthДlt"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "enthДlt nicht"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "endet nicht mit"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "existiert nicht"
 
-#: filter/libfilter-i18n.h:36
-msgid "does not match regex"
-msgstr "passt nicht auf Regex"
-
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "klingt nicht wie"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "beginnt nicht mit"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "endet mit"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "existiert"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "ist grЖъer als"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "ist kleiner als"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "ist nicht"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "ist"
 
-#: filter/libfilter-i18n.h:45
-msgid "matches regex"
-msgstr "passt auf Regex"
-
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "am oder nach"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "am oder vor"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "klingt wie"
 
-#: filter/libfilter-i18n.h:49
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "beginnt mit"
 
-#: filter/libfilter-i18n.h:50
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "war nach"
 
-#: filter/libfilter-i18n.h:51
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "war vor"
 
@@ -3903,137 +4060,132 @@ msgstr "VOrdner-Regel hinzufЭgen"
 msgid "Edit VFolder Rule"
 msgstr "VFolder-Regel bearbeiten"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kann die Evolution-Mail-Komponente nicht initialisieren"
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr ""
-"Kann die Evolution-Mailzusammenfassungs-Komponente nicht initialisieren."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Evolutions Mailspeicherungs-Hash kann nicht initialisiert werden."
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "Speicher kann nicht bei der Shell registriert werden"
 
-#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:18
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Speichern"
 
-#: mail/folder-browser.c:169
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "Rumpf oder Betreff enthДlt"
 
-#: mail/folder-browser.c:170
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Rumpf enthДlt"
 
-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Betreff enthДlt"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Rumpf enthДlt nicht"
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Betreff enthДlt nicht"
 
-#: mail/folder-browser.c:451
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr "VOrdner Эber Betreffzeile"
 
-#: mail/folder-browser.c:452
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr "VOrdner Эber Absender"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr "VOrdner Эber EmpfДnger"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr "Filter Эber Betreffzeile"
 
-#: mail/folder-browser.c:456
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr "Filter Эber Absender"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr "Filter Эber EmpfДnger"
 
-#: mail/folder-browser.c:458 mail/folder-browser.c:543
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr "Filter Эber Mailingliste"
 
-#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "жffnen"
 
-#: mail/folder-browser.c:464 mail/mail-view.c:163
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:29
+#: mail/folder-browser.c:466
+#, fuzzy
+msgid "Save As..."
+msgstr "Speichern _unter..."
+
+#: 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
 msgid "Print"
 msgstr "Drucken"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Antwort an Absender"
 
-#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:35
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Allen antworten"
 
-#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: mail/folder-browser.c:469 ui/evolution-mail.xml.h:19
-msgid "Forward as Attachment"
-msgstr "Als Anlage weiterleiten"
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "In der Zeit vorangehen"
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "Als gelesen markieren"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Als ungelesen markieren"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:480
 msgid "Undelete"
 msgstr "LЖschen rЭckgДngig"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:481
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr "Filter anwenden"
 
-#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Regel aus Nachricht erzeugen"
 
-#: mail/folder-browser.c:485
-msgid "View Message Source"
-msgstr "Nachrichtenquellcode betrachten"
-
-#: mail/folder-browser.c:545
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter Эber Mailingliste (%s)"
@@ -4053,7 +4205,7 @@ msgstr "Betreff ist %s"
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
@@ -4110,15 +4262,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Sie mЭssen EmpfДnger angeben, um diese Nachricht zu senden."
 
-#: mail/mail-callbacks.c:542
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Machricht(en) verschieben in"
 
-#: mail/mail-callbacks.c:544
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Machricht(en) kopieren in"
 
-#: mail/mail-callbacks.c:659
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4126,7 +4278,29 @@ msgstr ""
 "Sie kЖnnen nur im EntwЭrfe-Ordner\n"
 "abgespeicherte Nachrichten bearbeiten."
 
-#: mail/mail-callbacks.c:788
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "Datei Эberschreiben?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Eine Datei mit diesem Namen existiert bereits.\n"
+"эberschreiben?"
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Speichern unter..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Speichern unter..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4135,15 +4309,47 @@ msgstr ""
 "Fehler beim Laden von Filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:833
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/mail-callbacks.c:880
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Drucken der Nachricht fehlgeschlagen"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr "IdentitДt"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "Mailkonfiguration"
+
+#: po/tmp/mail-config-druid.glade.h:8
+#, fuzzy
+msgid "Mail Source"
+msgstr "Mailquellen"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Mailtransport"
+
+#: po/tmp/mail-config-druid.glade.h:10
+#, fuzzy
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr "Willkommen zum Evolution-Mailkonfigurations-Druiden! "
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -4153,59 +4359,64 @@ msgstr ""
 "ausgehenden Mail ein. Sie kЖnnen auf Wunsch auch den Namen Ihrer "
 "Organisation erwДhnen, und den einer Datei, in der Ihre Signatur steht."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Voller Name:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: mail/mail-config-druid.glade.h:41 mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config-druid.glade.h:63 mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Signaturdatei:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:20
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Signaturdatei"
 
-#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config-druid.glade.h:67 mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Pfad:"
 
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Authentikation:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "UnterstЭtzte Typen feststellen..."
 
-#: mail/mail-config-druid.glade.h:24 mail/mail-config-gui.c:967
+#: mail/mail-config-gui.c:968
+#, fuzzy
+msgid "Remember this password"
+msgstr "Sich an mein Passwort erinnern"
+
+#: mail/mail-config-gui.c:991
 msgid "Don't delete messages from server"
 msgstr "Nachrichten nicht vom Server lЖschen"
 
-#: mail/mail-config-druid.glade.h:65 mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Einstellungen testen"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Mailquellen-Typ:"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4219,11 +4430,11 @@ msgstr ""
 "Wenn der Server Authentikation erfordert, kЖnnen Sie auf \"UnterstЭtzte "
 "Typen feststellen...\" klicken, bevor Sie andere Informationen eingeben."
 
-#: mail/mail-config-gui.c:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "Newsquellen-Typ:"
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4238,332 +4449,112 @@ msgstr ""
 "Typen feststellen...\" klicken, nachdem Sie die anderen Informationen "
 "eingegeben haben."
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "Mailtransport-Typ:"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "IdentitДt hinzufЭgen"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "IdentitДt bearbeiten"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Quelle hinzufЭgen"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Quelle bearbeiten"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Newsserver hinzufЭgen"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Newsserver bearbeiten"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Teste \"%s\""
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Testverbindung mit \"%s\""
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "Die Verbindung war erfolgreich!"
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Ermittle AutorisationsfДhigkeiten von \"%s\""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "Ermittle Autorisation auf \"%s\""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr "Account-Information"
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr "Accountverwaltung"
-
-#: mail/mail-config-druid.glade.h:9
-msgid "Accounts"
-msgstr "Accounts"
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Add Optional Fields..."
-msgstr "Optionale Felder hinzufЭgen..."
-
-#: mail/mail-config-druid.glade.h:12
-msgid "Additional Identity Fields"
-msgstr "ZusДtzliche IdentitДtsfelder"
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Authentication"
-msgstr "Authentikation"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Browse..."
-msgstr "StЖbern..."
-
-#: mail/mail-config-druid.glade.h:16
-msgid "Congratulations, your mail configuration is complete."
-msgstr "GlЭckwunsch! Ihre Mailkonfiguration ist abgeschlossen."
-
-#: mail/mail-config-druid.glade.h:22
-msgid "Default"
-msgstr "Voreingestellt"
-
-#: mail/mail-config-druid.glade.h:25
-msgid "Done"
-msgstr "Fertig"
-
-#: mail/mail-config-druid.glade.h:27
-msgid "Edit Mail Configuration Settings"
-msgstr "Mailkonfiguration bearbeiten"
-
-#: mail/mail-config-druid.glade.h:28
-msgid "Email Address:"
-msgstr "E-Mail-Adresse:"
-
-#: mail/mail-config-druid.glade.h:29
-msgid "Evolution Mail Configuration"
-msgstr "Evolution-Mailkonfiguration"
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Full Name:"
-msgstr "Voller Name:"
-
-#: mail/mail-config-druid.glade.h:31
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Identity"
-msgstr "IdentitДt"
-
-#: mail/mail-config-druid.glade.h:33
-msgid "Mail"
-msgstr "Mail"
-
-#: mail/mail-config-druid.glade.h:34
-msgid "Mail Configuration"
-msgstr "Mailkonfiguration"
-
-#: mail/mail-config-druid.glade.h:35
-msgid "Mail Configuration Druid"
-msgstr "Mailkonfigurations-Druide"
-
-#: mail/mail-config-druid.glade.h:36
-msgid "Make this my default account"
-msgstr "Dies zu meinem Standardaccount machen"
-
-#: mail/mail-config-druid.glade.h:38
-msgid "News"
-msgstr "Nachrichten"
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Optional"
-msgstr "Optional"
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Optional Information"
-msgstr "Optionale Informationen"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Password:"
-msgstr "Passwort:"
-
-#: mail/mail-config-druid.glade.h:44
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what"
-msgstr ""
-"Bitte geben Sie unten Informationen Эber Ihren Server fЭr eingehende Mail "
-"ein. Wenn Sie nicht wissen, was"
-
-#: mail/mail-config-druid.glade.h:46
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know "
-msgstr ""
-"Bitte geben Sie unten Informationen Эber Ihren Server fЭr ausgehende Mail "
-"ein. Wenn Sie nicht wissen, was"
-
-#: mail/mail-config-druid.glade.h:48
-msgid ""
-"Please enter your name and email address below. The &quot;optional&quot; "
-"fields below do not "
-msgstr ""
-"Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse ein. Die "
-"&quot;optionalen&quot; Felder unten sind nicht"
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Preferred type: "
-msgstr "Bevorzugter Typ: "
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Receiving Email"
-msgstr "Mail erhalten"
-
-#: mail/mail-config-druid.glade.h:52
-msgid "Receiving Mail"
-msgstr "Mail erhalten"
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Remember my password"
-msgstr "Sich an mein Passwort erinnern"
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Reply-to:"
-msgstr "Antwort an:"
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Required"
-msgstr "BenЖtigt"
-
-#: mail/mail-config-druid.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: mail/mail-config-druid.glade.h:57
-msgid "SMTP server requires authentication"
-msgstr "SMTP-Server benЖtigt Authentikation"
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Sending Email"
-msgstr "Sende E-Mail"
-
-#: mail/mail-config-druid.glade.h:59
-msgid "Sending Mail"
-msgstr "Sende Mail"
-
-#: mail/mail-config-druid.glade.h:60
-msgid "Server Configuration"
-msgstr "Server-Konfiguration"
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Server Type: "
-msgstr "Servertyp: "
-
-#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:21
-msgid "Sources"
-msgstr "Quellen"
-
-#: mail/mail-config-druid.glade.h:68
-msgid "Welcome to the Evolution Mail Configuration Druid! "
-msgstr "Willkommen zum Evolution-Mailkonfigurations-Druiden! "
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming"
-msgstr ""
-"Sie sind fast fertig mit der Mailkonfiguration. Die IdentitДt, der Server "
-"fЭr eingehende"
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Your mail server supports the following types of authentication. Please"
-msgstr "Ihr Mailserver unterstЭtzt folgende Authentikationstypen. Bitte"
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adresse"
 
-#: mail/mail-config.glade.h:11
+#: po/tmp/mail-config.glade.h:10
 msgid "Identities"
 msgstr "IdentitДten"
 
-#: mail/mail-config.glade.h:12
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Mailquellen"
 
-#: mail/mail-config.glade.h:13
-msgid "Mail Transport"
-msgstr "Mailtransport"
-
-#: mail/mail-config.glade.h:14
+#: po/tmp/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Nachrichten als gesehen markieren [ms]: "
 
-#: mail/mail-config.glade.h:15
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Newsserver"
 
-#: mail/mail-config.glade.h:16
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Newsquellen"
 
-#: mail/mail-config.glade.h:17
+#: po/tmp/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organisation"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Nachrichten in HTML-Format senden"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Pipe zu %s konnte nicht angelegt werden: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "%s konnte nicht ausgefЭhrt werden: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Kann %s nicht forken: %s"
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Quellen"
 
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Bitte geben Sie Ihre PGP-/GPG-Passphrase ein."
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Kein Passwort angegeben."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Konnte Pipe zu GPG/PGP nicht anlegen: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Kein GPG/PGP-Programm verfЭgbar."
 
-#: mail/mail-display.c:67
-msgid "Overwrite file?"
-msgstr "Datei Эberschreiben?"
-
-#: mail/mail-display.c:71
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Eine Datei mit diesem Namen existiert bereits.\n"
-"эberschreiben?"
-
-#: mail/mail-display.c:85
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4572,123 +4563,128 @@ msgstr ""
 "Datei %s konnte nicht geЖffnet werden:\n"
 "%s"
 
-#: mail/mail-display.c:97
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-display.c:193
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Anlage speichern"
 
-#: mail/mail-display.c:233
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "TemporДres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/mail-display.c:275
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Auf Platte speichern..."
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "жffnen in %s..."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "An Ort und Stelle betrachten"
 
-#: mail/mail-display.c:303
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Externer Betrachter"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "An Ort und Stelle betrachten (Эber %s)"
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Verbergen"
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s-Anlage"
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
-#: mail/mail-format.c:823
+#: mail/mail-format.c:845
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 "Keine GPG-/PGP-UnterstЭtzung in diesem Exemplar von Evolution verfЭgbar."
 
-#: mail/mail-format.c:835
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "VerschlЭsselte Nachricht nicht angezeigt"
 
-#: mail/mail-format.c:841
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "VerschlЭsselte Nachricht"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Zum EntschlЭsseln Icon klicken."
 
-#: mail/mail-format.c:1444
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Zeiger auf FTP-Site (%s)"
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Zeiger auf lokale Datei (%s) gЭltig auf Site \"%s\""
 
-#: mail/mail-format.c:1460
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Zeiger auf lokale Datei (%s)"
 
-#: mail/mail-format.c:1494
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Zeiger auf unbekannte externe Daten (Typ \"%s\")"
 
-#: mail/mail-format.c:1499
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "UngЭltiger external-body-Teil."
 
-#: mail/mail-local.c:194
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Wandle Ordner \"%s\" in \"%s\"-Format um"
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Ordner \"%s\" in \"%s\"-Format umwandeln"
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Schlieъe aktuellen Ordner"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Benenne alten Ordner um und Жffne"
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Lege einen neuen Ordner an"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopiere Nachrichten"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4697,7 +4693,7 @@ msgstr ""
 "Metainformationen zu Ordner kЖnnen nicht gespeichert werden; Sie\n"
 "werden ihn wahrscheinlich nie mehr Жffnen kЖnnen: %s"
 
-#: mail/mail-local.c:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4705,295 +4701,306 @@ msgstr ""
 "Wenn Sie diese Mailbox nicht mehr Жffnen kЖnnen,\n"
 "werden Sie sie wohl von Hand reparieren mЭssen."
 
-#: mail/mail-local.c:659
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr "Lokaler Ordner wird registriert"
 
-#: mail/mail-local.c:661
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "Lokalen Ordner registrieren"
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Rufe E-Mail von %s ab"
 
-#: mail/mail-ops.c:72
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "E-Mail von %s abrufen"
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Es gibt keine neue Mail auf %s."
 
-#: mail/mail-ops.c:367
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtere E-Mail auf Anfrage"
 
-#: mail/mail-ops.c:369
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "E-Mail auf Anfrage filtern"
 
-#: mail/mail-ops.c:504
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Sende \"%s\""
 
-#: mail/mail-ops.c:509
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "Sende eine Nachricht ohne eine Betreffzeile"
 
-#: mail/mail-ops.c:512
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "\"%s\" senden"
 
-#: mail/mail-ops.c:515
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Eine Nachricht ohne eine Betreffzeile senden"
 
-#: mail/mail-ops.c:686
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "Sende Warteschlange"
 
-#: mail/mail-ops.c:688
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Warteschlange senden"
 
-#: mail/mail-ops.c:824 mail/mail-ops.c:831
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "HДnge \"%s\" an"
 
-#: mail/mail-ops.c:828 mail/mail-ops.c:834
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "HДnge eine Nachricht ohne eine Betreffzeile an"
 
-#: mail/mail-ops.c:906
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "SДubere \"%s\""
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "\"%s\" sДubern"
 
-#: mail/mail-ops.c:967
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Verschiebe Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:972
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Machrichten von \"%s\" in \"%s\" verschieben"
 
-#: mail/mail-ops.c:974
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiere Nachrichten von \"%s\" in \"%s\""
 
-#: mail/mail-ops.c:1005
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Verschiebe"
 
-#: mail/mail-ops.c:1008
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopiere"
 
-#: mail/mail-ops.c:1028
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s Nachricht %d von %d (UID \"%s\")"
 
-#: mail/mail-ops.c:1107
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Markiere Nachrichten in Ordner \"%s\""
 
-#: mail/mail-ops.c:1110
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Markiere Nachrichten in Ordner \"%s\""
 
-#: mail/mail-ops.c:1141
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Markiere Nachricht %d von %d"
 
-#: mail/mail-ops.c:1264
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Taste Ordner in \"%s\" ab"
 
-#: mail/mail-ops.c:1266
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Ordner in \"%s\" abtasten"
 
-#: mail/mail-ops.c:1335 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Keine Beschreibung)"
 
-#: mail/mail-ops.c:1396
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "HДnge Nachrichten aus Ordner \"%s\" an"
 
-#: mail/mail-ops.c:1399
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Nachrichten aus \"%s\" beilegen"
 
-#: mail/mail-ops.c:1499
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Leite Nachrichten weiter: \"%s\""
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Leite eine Nachricht ohne eine Betreffzeile weiter"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Nachricht \"%s\" weiterleiten"
 
-#: mail/mail-ops.c:1510
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Eine Nachricht ohne eine Betreffzeile weiterleiten"
 
-#: mail/mail-ops.c:1557
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Rufe Nachricht Nummer %d von %d ab (UID \"%s\")"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Konnte beim Erzeugen der weitergeleiteten Nachricht keinen MIME-Part aus der "
 "Nachricht erzeugen."
 
-#: mail/mail-ops.c:1736
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "Weitergeleitete Nachricht - %s"
+
+#: mail/mail-ops.c:1679
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Weitergeleitete Nachricht - %s"
+
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Lade \"%s\""
 
-#: mail/mail-ops.c:1738
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "\"%s\" laden"
 
-#: mail/mail-ops.c:1840
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Erzeuge \"%s\""
 
-#: mail/mail-ops.c:1842
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "\"%s\" erzeugen"
 
-#: mail/mail-ops.c:1890
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 "Ausnahmezustand beim эbermitteln des Ergebnisses an "
 "Shell-Komponenten-Listener."
 
-#: mail/mail-ops.c:1936
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synchronisiere \"%s\""
 
-#: mail/mail-ops.c:1938
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "\"%s\" synchronisieren"
 
-#: mail/mail-ops.c:2002
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Zeige Nachrichten-UID \"%s\" an"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "LЖsche Nachrichtenanzeige"
 
-#: mail/mail-ops.c:2008
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Nachrichten-UID \"%s\" anzeigen"
 
-#: mail/mail-ops.c:2011
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "Nachrichtenanzeige lЖschen"
 
-#: mail/mail-ops.c:2124
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "жffne Nachrichten aus Ordner \"%s\""
 
-#: mail/mail-ops.c:2127
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Nachrichten aus \"%s\" Жffnen"
 
-#: mail/mail-ops.c:2231
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Lade %s-Ordner"
 
-#: mail/mail-ops.c:2233
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "%s-Ordner laden"
 
-#: mail/mail-ops.c:2300
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Betrachte Nachrichten aus Ordner \"%s\""
 
-#: mail/mail-ops.c:2303
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Nachrichten aus Ordner \"%s\" betrachten"
 
-#: mail/mail-ops.c:2329 mail/mail-ops.c:2447
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Rufe Nachricht %d von %d ab (UID \"%s\")"
 
-#: mail/mail-ops.c:2419
-#, c-format
-msgid "Viewing message sources from folder \"%s\""
-msgstr "Betrachte Nachrichtenquellen aus Ordner \"%s\""
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "HДnge Nachrichten aus Ordner \"%s\" an"
 
-#: mail/mail-ops.c:2422
-#, c-format
-msgid "View message sources from \"%s\""
-msgstr "Nachrichtenquellen aus \"%s\" betrachten"
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "жffne Nachrichten aus Ordner \"%s\""
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Rufe Nachricht %d von %d ab (UID \"%s\")"
 
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: mail/mail-summary.c:95 mail/mail-threads.c:703
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "UnvollstДndige Nachricht auf Pipe geschrieben!"
 
-#: mail/mail-summary.c:368
-msgid "Mailbox summary"
-msgstr "Postfach-Zusammenfassung"
-
 #: mail/mail-threads.c:301
 #, c-format
 msgid ""
@@ -5003,7 +5010,7 @@ msgstr ""
 "Fehler beim Vorbereiten auf %s:\n"
 "%s"
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5012,34 +5019,34 @@ msgstr ""
 "Fehler beim `%s'_\n"
 "%s"
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr "Fehler beim Lesen von Befehlen vom verwaltenden Thread."
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "Schadhafte Nachricht von verwaltendem Thread?"
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Konnte Dialogfenster nicht erzeugen."
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "Benutzer hat Anfrage abgebrochen."
 
-#: mail/mail-tools.c:187
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Konnte temporДre Mbox `%s' nicht anlegen: %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:237
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "Begutachte %s"
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5048,41 +5055,41 @@ msgstr ""
 "Nachrichten erhalten werden."
 
 #. Info
-#: mail/mail-tools.c:288
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Rufe Nachricht %d von %d ab"
 
 #. Append it to dest
-#: mail/mail-tools.c:301
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Schreibe Nachricht %d von %d"
 
-#: mail/mail-tools.c:330
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Speichere дnderungen an %s"
 
-#: mail/mail-tools.c:367
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (weitergeleitete Nachricht)"
 
-#: mail/mail-tools.c:377
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (keine Betreffzeile)"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Weitergeleitete Nachricht - %s"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "Weitergeleitete Nachricht (keine Betreffzeile)"
 
-#: mail/mail-tools.c:521
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5095,56 +5102,72 @@ msgstr ""
 msgid "VFolders"
 msgstr "VOrdner"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr "Neuer VFolder"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:34
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Antworten"
 
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:39
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "An den Sender der Nachricht antworten"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "allen EmpfДngern der Nachricht antworten"
 
-#: mail/mail-view.c:159 ui/evolution-mail.xml.h:20
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Die Nachricht weiterleiten"
 
-#: mail/mail-view.c:163 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Die gewДhlte Nachricht drucken"
 
-#: mail/mail-view.c:165 ui/evolution-mail.xml.h:13
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Die Nachricht lЖschen"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:2045
+#: mail/message-list.c:575
+msgid "Seen"
+msgstr "Gelesen"
+
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr "Beantwortet"
+
+#: mail/message-list.c:846
+#, 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
+
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "Unbekannt"
+
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "Baue Nachrichtenansicht neu auf"
 
-#: mail/message-list.c:2047
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Nachrichtenansicht neu aufbauen"
 
-#: mail/message-thread.c:583
-msgid "Threading message list"
-msgstr "Nachrichtenliste wird in StrДnge geordnet"
-
-#: mail/message-thread.c:585
-msgid "Thread message list"
-msgstr "Nachrichtenliste in StrДnge ordnen"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr "Ordner anzeigen, die beginnen mit:"
@@ -5179,11 +5202,11 @@ msgstr "Ordner \"%s\" abonnieren"
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Ordner \"%s\" abbestellen"
 
-#: shell/e-setup.c:110 shell/e-setup.c:179
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Installation von Evolution"
 
-#: shell/e-setup.c:114
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5191,31 +5214,31 @@ msgstr ""
 "Diese neue Version von Evolution muss zusДtzliche Dateien in Ihr\n"
 "persЖnliches Evolution-Verzeichnis installieren"
 
-#: shell/e-setup.c:115
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Bitte klicken Sie \"OK\", um die Dateien zu installieren, oder \"Abbrechen\" "
 "zum Beenden."
 
-#: shell/e-setup.c:156
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr "Dateien konnte nicht korrekt aktualisiert werden"
 
-#: shell/e-setup.c:160 shell/e-setup.c:220
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Evolutions Dateien erfolgreich installiert."
 
-#: shell/e-setup.c:183
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "Dies scheint das erste Mal zu sein, dass Sie Evolution ausfЭhren."
 
-#: shell/e-setup.c:184
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Bitte klicken Sie \"OK\", um Evolutions Benutzerdateien zu installieren "
 "unter:"
 
-#: shell/e-setup.c:201
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5227,7 +5250,7 @@ msgstr ""
 "nicht anlegen.\n"
 "Fehler: %s"
 
-#: shell/e-setup.c:216
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5237,7 +5260,7 @@ msgstr ""
 "`%s'\n"
 "kopieren."
 
-#: shell/e-setup.c:241
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5248,7 +5271,7 @@ msgstr ""
 "Bitte verschieben Sie es, damit Evolution seine\n"
 "Benutzerdateien installieren kann."
 
-#: shell/e-setup.c:253
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5305,11 +5328,11 @@ msgstr "Der Fehlermelder kann nicht gefunden werden"
 msgid "Bug buddy could not be run."
 msgstr "Der Fehlermelder kann nicht starten"
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5319,34 +5342,29 @@ msgstr ""
 "und Kontakt-Management Anwendung\n"
 "innerhalt der GNOME-Desktops."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Gehe zu Ordner..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Kein Ordner angezeigt)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Ordner"
 
-#: shell/e-shell-view.c:1018 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr "Keine"
-
-#: shell/e-shell-view.c:1022
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kann lokalen Speicher nicht einstellen -- %s"
 
-#: shell/e-shell.c:1157
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5424,64 +5442,65 @@ msgstr "Diese VerknЭpfung aus der VerknЭpfungsleiste entfernen"
 msgid "Error saving shortcuts."
 msgstr "Fehler beim Speichern von VerknЭpfungen."
 
-#: shell/e-storage.c:128
+#: 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
+msgid "_View"
+msgstr "_Ansicht"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Den gewДhlten Ordner betrachten"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Kein Name)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Kein Fehler"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Allgemeiner Fehler"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Ein Ordner mit dem gleichen Namen existiert bereits"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Der angegebene Ordnertyp ist ungЭltig"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "E-/A-Fehler"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Nicht genЭgend Platz, um den Ordner zu erstellen"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Der angegebene Ordner wurde nicht gefunden"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "Funktion fЭr diese Speicherweise nicht implementiert"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Erlaubnis verweigert"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Operation nicht unterstЭtzt"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Der angegebene Typ wird fЭr diese Speicherweise nicht unterstЭtzt"
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
-#: ui/evolution-message-composer.xml.h:46 ui/evolution.xml.h:37
-msgid "_View"
-msgstr "_Ansicht"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Den gewДhlten Ordner betrachten"
-
-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5523,7 +5542,7 @@ msgstr ""
 "Wir hoffen, dass Ihnen die Ergebnisse unserer harten Arbeit gefallen\n"
 "werden, und wir hoffen auf Ihre Mitarbeit!\n"
 
-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5531,1115 +5550,1123 @@ msgstr ""
 "Danke.\n"
 "das Evolution-Team\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kann die Evolution-Shell nicht initialisieren."
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr "Deaktivieren."
 
-#: shell/main.c:166
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kann das Bonobo-System nicht initialisieren."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.xml.h:7
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "Neuer Verzeichnisserver"
 
-#: ui/evolution-addressbook-ldap.xml.h:8
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "_Aktionen"
 
-#: ui/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Einen neuen Kontakt anlegen"
 
-#: ui/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Einen Kontakt lЖschen"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Suchen"
 
-#: ui/evolution-addressbook.xml.h:12
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Einen Kontakt suchen"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Neu"
 
-#: ui/evolution-addressbook.xml.h:15
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Kontakte drucken"
 
-#: ui/evolution-addressbook.xml.h:16
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stopp"
 
-#: ui/evolution-addressbook.xml.h:17
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Laden abbrechen"
 
-#: ui/evolution-addressbook.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Alle betrachten"
 
-#: ui/evolution-addressbook.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Alle Kontakte betrachten"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_New Contact"
-msgstr "Neuer Kontakt?"
-
-#: ui/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "Kontakte drucken..."
 
-#: ui/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "Nach Kontakten suchen"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "Werkzeuge"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:7
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 Tage"
 
-#: ui/evolution-calendar.xml.h:8
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Einstellungen Дndern"
 
-#: ui/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Kalender"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Kalender-Einstellungen..."
 
-#: ui/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: ui/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
-#: ui/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Tag"
 
-#: ui/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "In der Zeit zurЭckgehen"
 
-#: ui/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "In der Zeit vorangehen"
 
-#: ui/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: ui/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Zu bestimmtem Datum gehen"
 
-#: ui/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Zur aktuellen Zeit gehen"
 
-#: ui/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Monat"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "New Ca_lendar"
-msgstr "Neuer Kalender"
-
-#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Weiter"
 
-#: ui/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Einen Kalender Жffnen"
 
-#: ui/evolution-calendar.xml.h:23
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "ZurЭck"
 
-#: ui/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:26
+#: po/tmp/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Kalender als etwas anderes speichern"
 
-#: ui/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Einen Tag zeigen"
 
-#: ui/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "1 Monat zeigen"
 
-#: ui/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "1 Woche zeigen"
 
-#: ui/evolution-calendar.xml.h:30
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Die Arbeitswoche zeigen"
 
-#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Heute"
 
-#: ui/evolution-calendar.xml.h:32
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Woche"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Neu"
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_New appointment..."
-msgstr "_Neuer Termin..."
-
-#: ui/evolution-calendar.xml.h:35
-msgid "_Open"
-msgstr "ж_ffnen"
-
-#: ui/evolution-calendar.xml.h:36
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "Kalender Жffnen"
 
-#: ui/evolution-calendar.xml.h:37
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "Diesen Kalender drucken"
 
-#: ui/evolution-calendar.xml.h:38
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "Kalender _speichern unter"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Diesen Eintrag lЖschen"
 
-#: ui/evolution-contact-editor.xml.h:9
+#: po/tmp/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "LЖschen..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Hilfe"
 
-#: ui/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr "Umschlag drucken..."
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "Diesen Eintrag drucken"
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Drucken..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-#: ui/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Speichern _unter..."
 
-#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Speichern und schlieъen"
 
-#: ui/evolution-contact-editor.xml.h:16
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Den Kontakt speichern und das Dialogfenster schlieъen"
 
-#: ui/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr "Kontakt an anderen senden..."
 
-#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:99
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr "Online-Hilfe einsehen"
 
-#: ui/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "_Nachricht an Kontakt senden..."
 
-#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:111
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:17
-#: ui/evolution.xml.h:28
+#: 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
 msgid "_File"
 msgstr "_Datei"
 
-#: ui/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "_Drucken..."
 
-#: ui/evolution-contact-editor.xml.h:22 ui/evolution-event-editor.xml.h:122
-#: ui/evolution-message-composer.xml.h:45
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Speichern"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "эber diese Anwendung"
 
-#: ui/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Info..."
 
-#: ui/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "Aktio_nen"
 
-#: ui/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_LЖschen"
 
-#: ui/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "Ausschneiden"
 
-#: ui/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "LЖschen"
 
-#: ui/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Die Auswahl lЖschen"
 
-#: ui/evolution-event-editor.xml.h:15
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Diesen Termin abschlieъen"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ui/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Die Auswahl kopieren"
 
-#: ui/evolution-event-editor.xml.h:18
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: ui/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Die Auswahl ausschneiden"
 
-#: ui/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "XML auswerfen"
 
-#: ui/evolution-event-editor.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Die XML-UI-Beschreibung auswerfen"
 
-#: ui/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: Adress_buch..."
 
-#: ui/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Formular wДhlen..."
 
-#: ui/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Namen prЭfen"
 
-#: ui/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: In Ordner kopieren..."
 
-#: ui/evolution-event-editor.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: Ein Formular entwerfen..."
 
-#: ui/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Druckstile definieren"
 
-#: ui/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: Dieses Formular bearbeiten"
 
-#: ui/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Erster Eintrag im Ordner"
 
-#: ui/evolution-event-editor.xml.h:32
+#: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Weiterleiten"
 
-#: ui/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Als vCalendar weiterleiten"
 
-#: ui/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Hilfe"
 
-#: ui/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: UnvollstДndige Aufgabe"
 
-#: ui/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Datei einfЭgen"
 
-#: ui/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: Eintrag..."
 
-#: ui/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Besonderes einfЭgen..."
 
-#: ui/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Druckvorschau"
 
-#: ui/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Formular verЖffentlichen als..."
 
-#: ui/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: _Formular verЖffentlichen..."
 
-#: ui/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr "FIXME: Wiederholung..."
 
-#: ui/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: Senden"
 
-#: ui/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Anlagen speichern..."
 
-#: ui/evolution-event-editor.xml.h:45
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: Skriptdebugger"
 
-#: ui/evolution-event-editor.xml.h:46
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Aufgabenanfrage"
 
-#: ui/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: Kontakt"
 
-#: ui/evolution-event-editor.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: Anpassen..."
 
-#: ui/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Datei..."
 
-#: ui/evolution-event-editor.xml.h:50
+#: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: Schriftart..."
 
-#: ui/evolution-event-editor.xml.h:51
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: Formatierung"
 
-#: ui/evolution-event-editor.xml.h:52
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: Eintrag"
 
-#: ui/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: _Journal-Eintrag"
 
-#: ui/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: Letzter Eintrag im Ordner"
 
-#: ui/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Nachricht mailen"
 
-#: ui/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "FIXME: Memo-Stil"
 
-#: ui/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: In Ordner verschieben..."
 
-#: ui/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Neuer Termin"
 
-#: ui/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Notiz"
 
-#: ui/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Objekt..."
 
-#: ui/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: Absatz..."
 
-#: ui/evolution-event-editor.xml.h:62
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: Rechtschreibung..."
 
-#: ui/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _Standard"
 
-#: ui/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: Aufgabe"
 
-#: ui/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Ungelesener Eintrag"
 
-#: ui/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr "FIXME: was kommt hierher?"
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "Format"
 
-#: ui/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Weitersuchen"
 
-#: ui/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Weitersuchen"
 
-#: ui/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Zum nДchsten Eintrag gehen"
 
-#: ui/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Zum vorigen Eintrag gehen"
 
-#: ui/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Eigenschaften der Datei Дndern"
 
-#: ui/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "Weiter"
 
-#: ui/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "EinfЭgen"
 
-#: ui/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Inhalt der Zwischenablage einfЭgen"
 
-#: ui/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "ZurЭck"
 
-#: ui/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Voriger"
 
-#: ui/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Druckeinstellungen..."
 
-#: ui/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: ui/evolution-event-editor.xml.h:84
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Eigenschaften"
 
-#: ui/evolution-event-editor.xml.h:85
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Wiederherstellen"
 
-#: ui/evolution-event-editor.xml.h:86
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Die rЭckgДngig gemachte Aktion wiederherstellen"
 
-#: ui/evolution-event-editor.xml.h:87
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Ersetzen"
 
-#: ui/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Eine Zeichenkette ersetzen"
 
-#: ui/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Den Termin speichern und das Dialogfenster schlieъen"
 
-#: ui/evolution-event-editor.xml.h:93 ui/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Die aktuelle Datei speichern"
 
-#: ui/evolution-event-editor.xml.h:94
+#: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr "Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr "Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:96
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr "Eine Besprechung ansetzen"
 
-#: ui/evolution-event-editor.xml.h:97
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Noch einmal nach derselben Zeichenkette suchen"
 
-#: ui/evolution-event-editor.xml.h:98
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Eine Zeichenkette suchen"
 
-#: ui/evolution-event-editor.xml.h:100
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Alle auswДhlen"
 
-#: ui/evolution-event-editor.xml.h:101
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Alles auswДhlen"
 
-#: ui/evolution-event-editor.xml.h:102
+#: po/tmp/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "Die Seiteneinstellungen fЭr Ihren aktuellen Drucker einrichten"
 
-#: ui/evolution-event-editor.xml.h:103
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "RЭckgДngig"
 
-#: ui/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Die letzte Aktion rЭckgДngig machen"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "Info..."
 
-#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "Schlieъen"
 
-#: ui/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "Kopieren"
 
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr "_Diagnose"
 
-#: ui/evolution-event-editor.xml.h:110 ui/evolution-message-composer.xml.h:40
-#: ui/evolution-subscribe.xml.h:16 ui/evolution.xml.h:27
+#: 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
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: ui/evolution-event-editor.xml.h:112
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "Suchen..."
 
-#: ui/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formulare"
 
-#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
-#: ui/evolution.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ui/evolution-event-editor.xml.h:115
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "EinfЭgen"
 
-#: ui/evolution-event-editor.xml.h:116
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Objekt"
 
-#: ui/evolution-event-editor.xml.h:117
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "EinfЭgen"
 
-#: ui/evolution-event-editor.xml.h:118
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "Drucken"
 
-#: ui/evolution-event-editor.xml.h:119
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "Eigenschaften..."
 
-#: ui/evolution-event-editor.xml.h:120
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "Wiederherstellen"
 
-#: ui/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "Ersetzen..."
 
-#: ui/evolution-event-editor.xml.h:123
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "Werkzeugleisten"
 
-#: ui/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "RЭckgДngig"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:7
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Erstellen"
 
-#: ui/evolution-mail.xml.h:8
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Eine neue Nachricht erstellen"
 
-#: ui/evolution-mail.xml.h:10
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner kopieren"
 
-#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "Ordner"
 
-#: ui/evolution-mail.xml.h:15
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Filter Эber Absender"
 
-#: ui/evolution-mail.xml.h:16
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filter Эber EmpfДnger"
 
-#: ui/evolution-mail.xml.h:17
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "PasswЖrter vergessen"
 
-#: ui/evolution-mail.xml.h:21
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Mail abrufen"
 
-#: ui/evolution-mail.xml.h:22
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "Mail_filter..."
 
-#: ui/evolution-mail.xml.h:23
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
 msgstr "Abonnements verwalten..."
 
-#: ui/evolution-mail.xml.h:24
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "Als gelesen markieren"
 
-#: ui/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Als ungelesen markieren"
 
-#: ui/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Verschieben"
 
-#: ui/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Die Nachricht in einen neuen Ordner verschieben"
 
-#: ui/evolution-mail.xml.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Zeigt eine Vorschau der zu druckenden Nachricht"
 
-#: ui/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Druckvorschau der Nachricht..."
 
-#: ui/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Nachricht auf dem Drucker drucken"
 
-#: ui/evolution-mail.xml.h:32
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Nachricht drucken..."
 
-#: ui/evolution-mail.xml.h:36
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "_Allen antworten"
 
-#: ui/evolution-mail.xml.h:37
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Antwort an Absender"
 
-#: ui/evolution-mail.xml.h:40 ui/evolution-subscribe.xml.h:13
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Alle auswДhlen"
 
-#: ui/evolution-mail.xml.h:41
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "Mail in der Warteschlange senden und neue Mail abholen"
 
-#: ui/evolution-mail.xml.h:42
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Nachrichtenliste in StrДnge geordnet"
 
-#: ui/evolution-mail.xml.h:43
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "VOrdner Эber Absender"
 
-#: ui/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "VOrdner Эber EmpfДnger"
 
-#: ui/evolution-mail.xml.h:45
+#: po/tmp/evolution-mail.xml.h:44
+#, fuzzy
+msgid "View Raw Message Source"
+msgstr "Nachrichtenquellcode betrachten"
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "Filter _anwenden"
 
-#: ui/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "Ordner konfigurieren"
 
-#: ui/evolution-mail.xml.h:47
+#: po/tmp/evolution-mail.xml.h:47
 msgid "_Copy to Folder..."
 msgstr "In Ordner kopieren..."
 
-#: ui/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "Nachricht bearbeiten"
 
-#: ui/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "SДubern"
 
-#: ui/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "Filter Эber Betreffzeile"
 
-#: ui/evolution-mail.xml.h:52
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "Weiterleiten"
 
-#: ui/evolution-mail.xml.h:53 ui/evolution-subscribe.xml.h:18
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "Auswahl umkehren"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Mail Configuration..."
-msgstr "_Mailkonfiguration..."
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "Mailkonfiguration"
 
-#: ui/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "Nachricht"
 
-#: ui/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Move to Folder..."
 msgstr "In Ordner verschieben..."
 
-#: ui/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "In neuem Fenster Жffnen"
 
-#: ui/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "Nachricht drucken"
 
-#: ui/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Speichern unter..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Quelle"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "In StrДngen"
 
-#: ui/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "LЖschen rЭckgДngig"
 
-#: ui/evolution-mail.xml.h:61
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "VOrdner Эber Betreffzeile"
 
-#: ui/evolution-mail.xml.h:62
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "Editor fЭr virtuelle Ordner..."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-message-composer.xml.h:7
+#: po/tmp/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "Beilegen"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Bold"
-msgstr "Fett"
-
-#: ui/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Die aktuelle Datei schlieъen"
 
-#: ui/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "Insert a file as text into the message"
 msgstr "Eine Datei als Text in die Nachricht einfЭgen"
 
-#: ui/evolution-message-composer.xml.h:15
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "Textdatei einfЭgen..."
 
-#: ui/evolution-message-composer.xml.h:17
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "Eine Datei Жffnen"
 
-#: ui/evolution-message-composer.xml.h:19
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Speichern _unter"
 
-#: ui/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "In Ordner speichern... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "In Ordner speichern..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Die aktuelle Datei unter anderem Namen speichern"
 
-#: ui/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Die Nachricht in einem bestimmten Ordner speichern"
 
-#: ui/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Senden"
 
-#: ui/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "SpДter senden"
 
-#: ui/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "SpДter senden"
 
-#: ui/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "Die Mail im HTML-Format senden"
 
-#: ui/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "Die Nachricht spДter senden"
 
-#: ui/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "Die Nachricht jetzt senden"
 
-#: ui/evolution-message-composer.xml.h:32
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "Diese Nachricht jetzt senden"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sets something as bold"
-msgstr "Etwas fett setzen"
-
-#: ui/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "Anlagen anzeigen / verbergen"
 
-#: ui/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "Anlagen anzeigen"
 
-#: ui/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "Anlagen zeigen"
 
-#: ui/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "Textdatei einfЭgen... (FIXME)"
 
-#: ui/evolution-message-composer.xml.h:44
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "жffnen..."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:7
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ordner zu Ihrer Liste abonnierter Ordner hinzufЭgen"
 
-#: ui/evolution-subscribe.xml.h:10
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
 
-#: ui/evolution-subscribe.xml.h:11
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Liste von Ordnern aktualisieren"
 
-#: ui/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Ordner aus Ihrer Liste abonnierter Ordner entfernen"
 
-#: ui/evolution-subscribe.xml.h:14
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ui/evolution-subscribe.xml.h:15
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Abonnement kЭndigen"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:7
-msgid "Create a new folder"
-msgstr "Einen neuen Ordner anlegen"
-
-#: ui/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Einen anderen Ordner anzeigen"
 
-#: ui/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Beenden"
 
-#: ui/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution-LeistenverknЭpfung"
 
-#: ui/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Das Programm verlassen"
 
-#: ui/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Erste Schritte"
 
-#: ui/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Information Эber Evolution anzeigen"
 
-#: ui/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Die Ordnerleiste anzeigen"
 
-#: ui/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Die VerknЭpfungsleiste anzeigen"
 
-#: ui/evolution.xml.h:16
+#: po/tmp/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Fehlerbericht einschicken"
 
-#: ui/evolution.xml.h:17
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
 msgstr "Einen Fehlerbericht mit Bug Buddy einschicken"
 
-#: ui/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Anzeige der Ordnerleiste an/aus"
 
-#: ui/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Anzeige der VerknЭpfungsleiste an/aus"
 
-#: ui/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Die Kontaktverwaltung benutzen"
 
-#: ui/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Den Kalender benutzen"
 
-#: ui/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Den _Mailer benutzen"
 
-#: ui/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "эber Evolution..."
 
-#: ui/evolution.xml.h:24
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "Termin (FIXME)"
 
-#: ui/evolution.xml.h:25
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:26
-msgid "_Create New Folder..."
-msgstr "Neuen Ordner anlegen..."
-
-#: ui/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "Ordner"
 
-#: ui/evolution.xml.h:30
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Gehe zu Ordner..."
 
-#: ui/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.xml.h:33
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "Mailnachricht (FIXME)"
 
-#: ui/evolution.xml.h:35
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "Einstellungen"
 
-#: ui/evolution.xml.h:36
+#: po/tmp/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "Auftrag (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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d. %B %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "VorlДufig"
@@ -6716,13 +6743,6 @@ msgstr "Ende der Besprechung:"
 msgid "All Attendees"
 msgstr "Alle Anwesenden"
 
-#. 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:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d. %B %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6732,25 +6752,366 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "Jetzt"
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr "%H.%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "Jetzt"
-
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Gruppe %i"
+
+#~ msgid "window2"
+#~ msgstr "windows2"
+
+#~ msgid "Create to-do item"
+#~ msgstr "To-Do-Eintrag erzeugen"
+
+#~ msgid "Edit to-do item"
+#~ msgstr "To-Do-Eintrag bearbeiten"
+
+#~ msgid "Summary:"
+#~ msgstr "Zusammenfassung:"
+
+#~ msgid "Due Date:"
+#~ msgstr "FДllig am:"
+
+#~ msgid "Priority:"
+#~ msgstr "PrioritДt:"
+
+#~ msgid "Item Comments:"
+#~ msgstr "Kommentar zum Eintrag:"
+
+#~ msgid "Time display"
+#~ msgstr "Zeitanzeige"
+
+#~ msgid "Time format"
+#~ msgstr "Zeitformat"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 Stunden (AM/PM)"
+
+#~ msgid "24-hour"
+#~ msgstr "24 Stunden"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Wochen beginnen mit"
+
+#~ msgid "Day range"
+#~ msgstr "Tagesbereich"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "Bitte wДhlen Sie den Anfang und das Ende des\n"
+#~ "Stundenbereichs, der in der Tages- und\n"
+#~ "Wochenansicht dargestellt werden soll. Zeiten\n"
+#~ "auъerhalb dieses Bereichs werden normalerweise\n"
+#~ "nicht dargestellt."
+
+#~ msgid "Day start:"
+#~ msgstr "Tagesbeginn:"
+
+#~ msgid "Day end:"
+#~ msgstr "Tagesende:"
+
+#~ msgid "Colors for display"
+#~ msgstr "Farben fЭr Anzeige"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "Auf To-Do-Liste zeigen:"
+
+#~ msgid "To Do List style options:"
+#~ msgstr "Stiloptionen der To-Do-Liste:"
+
+#~ msgid "Highlight overdue items"
+#~ msgstr "эberfДllige EintrДge markieren"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "Noch nicht fДllige EintrДge markieren"
+
+#~ msgid "Highlight items due today"
+#~ msgstr "Heute fДllig EintrДge markieren"
+
+#~ msgid "To Do List Properties"
+#~ msgstr "Eigenschaften der To-Do-Liste"
+
+#~ msgid "To Do List"
+#~ msgstr "To-Do-Liste"
+
+#~ msgid "Preferences"
+#~ msgstr "Einstellungen"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarme"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "Alarm-Eigenschaften"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "Bei angezeigtem Alarm piepsen"
+
+#~ msgid "Audio alarms timeout after"
+#~ msgstr "Audio-Alarme schweigen nach"
+
+#~ msgid " seconds"
+#~ msgstr " Sekunden"
+
+#~ msgid "Enable snoozing for "
+#~ msgstr "Weiterschlafen aktivieren fЭr "
+
+#~ msgid "Could not create summary"
+#~ msgstr "Zusammenfassung konnte nicht erzeugt werden"
+
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Nachricht kann nicht abgerufen werden: %s"
+
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Zum Lesen von Mail, die vom lokalen System geliefert wird, und zum Speichern "
+#~ "von Mail auf einer lokalen Platte."
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Ordner %s konnte nicht in %s umbenannt werden: Ziel existiert"
+
+#~ msgid "Could not open summary %s"
+#~ msgstr "Zusammenfassung %s konnte nicht geЖffnet werden"
+
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Zusammenfassungs-PrЭffehler, X-Evolution-Kopfzeile fehlt"
+
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Daten kЖnnen nicht in Ausgabedatei kopiert werden: %s"
+
+#~ msgid "Could not load or create summary"
+#~ msgstr "Zusammenfassung konnte nicht erzeugt oder geladen werden"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Ordner `%s' konnte nicht umbenannt werden: %s existiert"
+
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH-Ordner kЖnnen nicht geschachtelt werden."
+
+#~ msgid "Deleted"
+#~ msgstr "GelЖscht"
+
+#~ msgid "Draft"
+#~ msgstr "Entwurf"
+
+#~ msgid "Flagged"
+#~ msgstr "Markiert"
+
+#~ msgid "Set Flag"
+#~ msgstr "Marke setzen"
+
+#~ msgid "does not match regex"
+#~ msgstr "passt nicht auf Regex"
+
+#~ msgid "matches regex"
+#~ msgstr "passt auf Regex"
+
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr ""
+#~ "Kann die Evolution-Mailzusammenfassungs-Komponente nicht initialisieren."
+
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr "Evolutions Mailspeicherungs-Hash kann nicht initialisiert werden."
+
+#~ msgid "Forward as Attachment"
+#~ msgstr "Als Anlage weiterleiten"
+
+#~ msgid "Account Information"
+#~ msgstr "Account-Information"
+
+#~ msgid "Account Management"
+#~ msgstr "Accountverwaltung"
+
+#~ msgid "Accounts"
+#~ msgstr "Accounts"
+
+#~ msgid "Add Optional Fields..."
+#~ msgstr "Optionale Felder hinzufЭgen..."
+
+#~ msgid "Additional Identity Fields"
+#~ msgstr "ZusДtzliche IdentitДtsfelder"
+
+#~ msgid "Authentication"
+#~ msgstr "Authentikation"
+
+#~ msgid "Browse..."
+#~ msgstr "StЖbern..."
+
+#~ msgid "Congratulations, your mail configuration is complete."
+#~ msgstr "GlЭckwunsch! Ihre Mailkonfiguration ist abgeschlossen."
+
+#~ msgid "Default"
+#~ msgstr "Voreingestellt"
+
+#~ msgid "Done"
+#~ msgstr "Fertig"
+
+#~ msgid "Edit Mail Configuration Settings"
+#~ msgstr "Mailkonfiguration bearbeiten"
+
+#~ msgid "Email Address:"
+#~ msgstr "E-Mail-Adresse:"
+
+#~ msgid "Evolution Mail Configuration"
+#~ msgstr "Evolution-Mailkonfiguration"
+
+#~ msgid "Full Name:"
+#~ msgstr "Voller Name:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Mail"
+#~ msgstr "Mail"
+
+#~ msgid "Mail Configuration Druid"
+#~ msgstr "Mailkonfigurations-Druide"
+
+#~ msgid "Make this my default account"
+#~ msgstr "Dies zu meinem Standardaccount machen"
+
+#~ msgid "News"
+#~ msgstr "Nachrichten"
+
+#~ msgid "Optional"
+#~ msgstr "Optional"
+
+#~ msgid "Optional Information"
+#~ msgstr "Optionale Informationen"
+
+#~ msgid "Password:"
+#~ msgstr "Passwort:"
+
+#~ msgid ""
+#~ "Please enter information about your incoming mail server below. If you don't "
+#~ "know what"
+#~ msgstr ""
+#~ "Bitte geben Sie unten Informationen Эber Ihren Server fЭr eingehende Mail "
+#~ "ein. Wenn Sie nicht wissen, was"
+
+#~ msgid ""
+#~ "Please enter information about your outgoing mail protocol below. If you "
+#~ "don't know "
+#~ msgstr ""
+#~ "Bitte geben Sie unten Informationen Эber Ihren Server fЭr ausgehende Mail "
+#~ "ein. Wenn Sie nicht wissen, was"
+
+#~ msgid ""
+#~ "Please enter your name and email address below. The &quot;optional&quot; "
+#~ "fields below do not "
+#~ msgstr ""
+#~ "Bitte geben Sie unten Ihren Namen und Ihre E-Mail-Adresse ein. Die "
+#~ "&quot;optionalen&quot; Felder unten sind nicht"
+
+#~ msgid "Preferred type: "
+#~ msgstr "Bevorzugter Typ: "
+
+#~ msgid "Receiving Email"
+#~ msgstr "Mail erhalten"
+
+#~ msgid "Receiving Mail"
+#~ msgstr "Mail erhalten"
+
+#~ msgid "Reply-to:"
+#~ msgstr "Antwort an:"
+
+#~ msgid "Required"
+#~ msgstr "BenЖtigt"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "SMTP server requires authentication"
+#~ msgstr "SMTP-Server benЖtigt Authentikation"
+
+#~ msgid "Sending Email"
+#~ msgstr "Sende E-Mail"
+
+#~ msgid "Sending Mail"
+#~ msgstr "Sende Mail"
+
+#~ msgid "Server Configuration"
+#~ msgstr "Server-Konfiguration"
+
+#~ msgid "Server Type: "
+#~ msgstr "Servertyp: "
+
+#~ msgid ""
+#~ "You are almost done with the mail configuration process. The identity, "
+#~ "incoming"
+#~ msgstr ""
+#~ "Sie sind fast fertig mit der Mailkonfiguration. Die IdentitДt, der Server "
+#~ "fЭr eingehende"
+
+#~ msgid ""
+#~ "Your mail server supports the following types of authentication. Please"
+#~ msgstr "Ihr Mailserver unterstЭtzt folgende Authentikationstypen. Bitte"
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Pipe zu %s konnte nicht angelegt werden: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "%s konnte nicht ausgefЭhrt werden: %s\n"
+
+#~ msgid "Viewing message sources from folder \"%s\""
+#~ msgstr "Betrachte Nachrichtenquellen aus Ordner \"%s\""
+
+#~ msgid "View message sources from \"%s\""
+#~ msgstr "Nachrichtenquellen aus \"%s\" betrachten"
+
+#~ msgid "Mailbox summary"
+#~ msgstr "Postfach-Zusammenfassung"
+
+#~ msgid "Threading message list"
+#~ msgstr "Nachrichtenliste wird in StrДnge geordnet"
+
+#~ msgid "Thread message list"
+#~ msgstr "Nachrichtenliste in StrДnge ordnen"
+
+#~ msgid "_New Contact"
+#~ msgstr "Neuer Kontakt?"
+
+#~ msgid "New Ca_lendar"
+#~ msgstr "Neuer Kalender"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Neuer Termin..."
+
+#~ msgid "_Open"
+#~ msgstr "ж_ffnen"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Mailkonfiguration..."
+
+#~ msgid "Bold"
+#~ msgstr "Fett"
+
+#~ msgid "Sets something as bold"
+#~ msgstr "Etwas fett setzen"
+
+#~ msgid "Create a new folder"
+#~ msgstr "Einen neuen Ordner anlegen"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "Neuen Ordner anlegen..."
diff --git a/po/el.po b/po/el.po
index 4d6aec992f..cde8b7b91e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2000-07-10 21:51-0400\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -13,502 +13,405 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:58
-#: calendar/gui/calendar-pilot-sync.c:138 calendar/gui/main.c:68
-#, fuzzy
-msgid "Could not initialize Bonobo"
-msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
-
-#.
-#. * 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"
+#: addressbook/backend/ebook/e-card.c:3046
+msgid "Card: "
 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:"
+#: addressbook/backend/ebook/e-card.c:3048
+msgid ""
+"\n"
+"Name: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:579
-#: calendar/gui/event-editor.c:1118
-#, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "я_АМТЕБОЩ"
-
-#: addressbook/contact-editor/e-contact-editor.c:580
-#: calendar/gui/event-editor.c:1119
-#, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "аъ_ТГСГ сУМэМТГСГР"
-
-#: addressbook/contact-editor/e-contact-editor.c:582
-#: calendar/gui/event-editor.c:1121
-#, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "_лчМУЛА"
-
-#: addressbook/contact-editor/e-contact-editor.c:583
-#: calendar/gui/event-editor.c:1122
-#, fuzzy
-msgid "FIXME: _Contact"
-msgstr "_цМЫЯИЛъА"
-
-#: addressbook/contact-editor/e-contact-editor.c:584
-#: calendar/gui/event-editor.c:1123
-msgid "FIXME: _Task"
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:585
-#: calendar/gui/event-editor.c:1124
-#, fuzzy
-msgid "FIXME: Task _Request"
-msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
-
-#: addressbook/contact-editor/e-contact-editor.c:586
-#: calendar/gui/event-editor.c:1125
-#, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
-
-#: addressbook/contact-editor/e-contact-editor.c:587
-#: calendar/gui/event-editor.c:1126
-msgid "FIXME: _Note"
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:589
-#: addressbook/contact-editor/e-contact-editor.c:694
-#: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
-msgid "FIXME: Ch_oose Form..."
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:594
-#: calendar/gui/event-editor.c:1133
-msgid "FIXME: _Memo Style"
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:596
-#: calendar/gui/event-editor.c:1135
-msgid "FIXME: Define Print _Styles..."
+#: addressbook/backend/ebook/e-card.c:3053
+msgid ""
+"\n"
+"  Suffix:     "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:603
-#: calendar/gui/event-editor.c:1142
-msgid "FIXME: S_end"
+#: addressbook/backend/ebook/e-card.c:3067
+msgid ""
+"\n"
+"Birth Date: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:607
-#: calendar/gui/event-editor.c:1146
-#, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "мщА ЕПИСЩМАЬГ..."
-
-#: addressbook/contact-editor/e-contact-editor.c:609
-#: calendar/gui/event-editor.c:1148
-msgid "FIXME: _Delete"
+#: addressbook/backend/ebook/e-card.c:3078
+msgid ""
+"\n"
+"Address:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:610
-#: calendar/gui/event-editor.c:1149
-msgid "FIXME: _Move to Folder..."
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:611
-#: calendar/gui/event-editor.c:1150
-msgid "FIXME: Cop_y to Folder..."
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:613
-#: calendar/gui/event-editor.c:1152
-msgid "Page Set_up"
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:614
-#: calendar/gui/event-editor.c:1153
-msgid "FIXME: Print Pre_view"
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:635
-#: calendar/gui/event-editor.c:1174
-msgid "FIXME: Paste _Special..."
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:640
-#: calendar/gui/event-editor.c:1179
-msgid "FIXME: Mark as U_nread"
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:644
-#: calendar/gui/event-editor.c:1183
-#, fuzzy
-msgid "_Object"
-msgstr "хщЛА"
-
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: addressbook/contact-editor/e-contact-editor.c:656
-#: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
-msgid "FIXME: _Item"
+#: addressbook/backend/ebook/e-card.c:3086
+msgid ""
+"\n"
+"  Country:     "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:650
-#: addressbook/contact-editor/e-contact-editor.c:657
-#: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
-msgid "FIXME: _Unread Item"
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:651
-#: calendar/gui/event-editor.c:1190
-msgid "FIXME: Fi_rst Item in Folder"
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:658
-#: calendar/gui/event-editor.c:1197
-msgid "FIXME: _Last Item in Folder"
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:663
-#: calendar/gui/event-editor.c:1202
-msgid "FIXME: _Standard"
+#: addressbook/backend/ebook/e-card.c:3138
+msgid ""
+"\n"
+"E-mail:\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:665
-#: calendar/gui/event-editor.c:1204
-msgid "FIXME: __Formatting"
+#: addressbook/backend/ebook/e-card.c:3141
+msgid ""
+"\n"
+"E-mail:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:668
-#: calendar/gui/event-editor.c:1207
-msgid "FIXME: _Customize..."
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:673
-#: calendar/gui/event-editor.c:1212
-msgid "Pre_vious"
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:674
-#: calendar/gui/event-editor.c:1213
-msgid "Ne_xt"
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:676
-#: calendar/gui/event-editor.c:1217
-#, fuzzy
-msgid "_Toolbars"
-msgstr "е_ЯЦАКЕъА"
-
-#: addressbook/contact-editor/e-contact-editor.c:681
-#: calendar/gui/event-editor.c:1222
-msgid "FIXME: _File..."
+#: addressbook/backend/ebook/e-card.c:3178
+msgid ""
+"\n"
+"Business Role: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:682
-#: calendar/gui/event-editor.c:1223
-msgid "FIXME: It_em..."
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:683
-#: calendar/gui/event-editor.c:1224
-msgid "FIXME: _Object..."
+#: addressbook/backend/ebook/e-card.c:3191
+msgid ""
+"\n"
+"  Name:  "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:688
-#: calendar/gui/event-editor.c:1229
-msgid "FIXME: _Font..."
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:689
-#: calendar/gui/event-editor.c:1230
-msgid "FIXME: _Paragraph..."
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:696
-#: calendar/gui/event-editor.c:1237
-msgid "FIXME: Desi_gn This Form"
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:697
-#: calendar/gui/event-editor.c:1238
-msgid "FIXME: D_esign a Form..."
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/event-editor.c:1240
-msgid "FIXME: Publish _Form..."
+#: addressbook/backend/ebook/e-card.c:3199
+msgid ""
+"\n"
+"Categories: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:700
-#: calendar/gui/event-editor.c:1241
-msgid "FIXME: Pu_blish Form As..."
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"Comment: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:702
-#: calendar/gui/event-editor.c:1243
-msgid "FIXME: Script _Debugger"
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:707
-#: calendar/gui/event-editor.c:1248
-msgid "FIXME: _Spelling..."
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:709
-#: calendar/gui/event-editor.c:1253
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: 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/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
 #, fuzzy
-msgid "_Forms"
-msgstr "аПЭ"
-
-#: addressbook/contact-editor/e-contact-editor.c:714
-msgid "FIXME: _New Contact"
-msgstr ""
+msgid "Could not initialize Bonobo"
+msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
-#: addressbook/contact-editor/e-contact-editor.c:715
-msgid "FIXME: New _Contact from Same Company"
+#. This array must be in the same order as enumerations
+#. in GnomePilotConduitSyncType as they are used as index.
+#. Custom type implies Disabled state.
+#.
+#: addressbook/conduit/address-conduit-control-applet.c:77
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
+#: calendar/conduits/todo/todo-conduit-control-applet.c:77
+msgid "Disabled"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:717
-msgid "FIXME: New _Letter to Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:78
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
+#: calendar/conduits/todo/todo-conduit-control-applet.c:78
+msgid "Synchronize"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:718
-msgid "FIXME: New _Message to Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:79
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
+#: calendar/conduits/todo/todo-conduit-control-applet.c:79
+msgid "Copy From Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:719
-msgid "FIXME: New Meetin_g with Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:80
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
+#: calendar/conduits/todo/todo-conduit-control-applet.c:80
+msgid "Copy To Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:720
-msgid "FIXME: _Plan a Meeting..."
+#: addressbook/conduit/address-conduit-control-applet.c:81
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
+#: calendar/conduits/todo/todo-conduit-control-applet.c:81
+msgid "Merge From Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:721
-msgid "FIXME: New _Task for Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:82
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
+#: calendar/conduits/todo/todo-conduit-control-applet.c:82
+msgid "Merge To Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:722
-msgid "FIXME: New _Journal Entry for Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:724
-msgid "FIXME: _Flag for Follow Up..."
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+msgid "Original Author:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:725
-msgid "FIXME: _Display Map of Address"
+#: addressbook/conduit/address-conduit-control-applet.c:123
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:726
-msgid "FIXME: _Open Web Page"
+#: addressbook/conduit/address-conduit-control-applet.c:127
+msgid "Evolution Addressbook Conduit"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:728
-msgid "FIXME: Forward as _vCard"
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:729
-#: calendar/gui/event-editor.c:1266
-msgid "FIXME: For_ward"
+#: addressbook/conduit/address-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution addressbook conduit.\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:741
-#: calendar/gui/event-editor.c:1279
-msgid "_Insert"
+#: addressbook/conduit/address-conduit-control-applet.c:131
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
+msgid "gnome-unknown.xpm"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/event-editor.c:1280
-#, fuzzy
-msgid "F_ormat"
-msgstr "аПЭ"
-
-#. FIXME: add Favorites here
-#: addressbook/contact-editor/e-contact-editor.c:743
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:473
-msgid "_Tools"
-msgstr "е_ЯЦАКЕъА"
-
-#: addressbook/contact-editor/e-contact-editor.c:744
-#: calendar/gui/event-editor.c:1282
-#, fuzzy
-msgid "Actio_ns"
-msgstr "е_МщЯЦЕИЕР"
-
-#: addressbook/contact-editor/e-contact-editor.c:775
-msgid "Save and Close"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:776
-#: calendar/gui/event-editor.c:1321
-msgid "Save the appointment and close the dialog box"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:780
-#: calendar/gui/event-editor.c:1325
-msgid "FIXME: Print..."
+#: addressbook/conduit/address-conduit-control-applet.c:162
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
+#: calendar/conduits/todo/todo-conduit-control-applet.c:162
+msgid "Synchronize Action"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:781
-#: calendar/gui/event-editor.c:1326
-msgid "Print this item"
+#: addressbook/conduit/address-conduit-control-applet.c:214
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
+msgid "Conduit state"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/event-editor.c:1327
-msgid "FIXME: Insert File..."
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:783
-#: calendar/gui/event-editor.c:1328
-msgid "Insert a file as an attachment"
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
+msgid ""
+"No pilot configured, please choose the\n"
+"'Pilot Link Properties' capplet first."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/event-editor.c:1336
-msgid "FIXME: Delete"
+#: addressbook/conduit/address-conduit-control-applet.c:285
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
+#: calendar/conduits/todo/todo-conduit-control-applet.c:285
+msgid "Not connected to the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:786
-#: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:326
+#: addressbook/conduit/address-conduit-control-applet.c:290
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
 #, fuzzy
-msgid "Delete this item"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
-
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/event-editor.c:1339
-msgid "FIXME: Previous"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:789
-#: calendar/gui/event-editor.c:1340
-msgid "Go to the previous item"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:790
-#: calendar/gui/event-editor.c:1341
-msgid "FIXME: Next"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:791
-#: calendar/gui/event-editor.c:1342
-msgid "Go to the next item"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:792
-#: calendar/gui/event-editor.c:1343
-msgid "FIXME: Help"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/event-editor.c:1344
-msgid "See online help"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1208
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1209
-#: addressbook/contact-editor/e-contact-editor.c:1313
-msgid "Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1210
-msgid "Business 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1211
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1212
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1213
-msgid "Car"
+msgid ""
+"An error occured when trying to fetch\n"
+"pilot list from the gnome-pilot daemon"
 msgstr ""
+"пЯОщЙУЬЕ ЕНАъЯЕСГ ЙАТэ ТГМ АПЭПЕИЯА АМэЦМЫСГР ДЕДОЛщМЫМ ЛЕ PersistStream АПЭ "
+"ТГ ЛОМэДА"
 
-#: addressbook/contact-editor/e-contact-editor.c:1214
-#, fuzzy
-msgid "Company"
-msgstr "аМТИЦЯАЖч"
-
-#: addressbook/contact-editor/e-contact-editor.c:1215
-#: addressbook/contact-editor/e-contact-editor.c:1314
-#, fuzzy
-msgid "Home"
-msgstr "сГЛЕъЫ_ЛА"
-
-#: addressbook/contact-editor/e-contact-editor.c:1216
-#, fuzzy
-msgid "Home 2"
-msgstr "сГЛЕъЫ_ЛА"
-
-#: addressbook/contact-editor/e-contact-editor.c:1217
-#, fuzzy
-msgid "Home Fax"
-msgstr "сГЛЕъЫ_ЛА"
-
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "ISDN"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#, fuzzy
-msgid "Mobile"
-msgstr "_лчМУЛА"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-#: addressbook/contact-editor/e-contact-editor.c:1315
-msgid "Other"
+#: addressbook/conduit/address-conduit.c:210
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Other Fax"
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
+msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 #, fuzzy
-msgid "Pager"
-msgstr "еПИЙЭККГСГ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-#, fuzzy
-msgid "Primary"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Radio"
-msgstr ""
+msgid "Could not start wombat"
+msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-msgid "Telex"
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
+msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "TTY/TDD"
+#.
+#. * 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/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Primary Email"
+#: addressbook/contact-editor/categories-strings.h:8
+msgid "Item(s) belong to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Email 2"
+#: addressbook/contact-editor/categories-strings.h:9
+msgid "Available Categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Email 3"
-msgstr ""
+#.
+#. * 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
+#, fuzzy
+msgid "Delete Contact?"
+msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -520,6 +423,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
 msgid "_Delete"
 msgstr ""
 
@@ -532,8 +436,13 @@ msgstr ""
 msgid "New phone type"
 msgstr ""
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:91
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr ""
 
@@ -559,56 +468,62 @@ msgid "Wants to receive _HTML mail"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "Address:"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
 #, fuzzy
 msgid "_Home"
 msgstr "сГЛЕъЫ_ЛА"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
 msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
 #, fuzzy
 msgid "_Mobile"
 msgstr "_лчМУЛА"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
 msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
 #, fuzzy
 msgid "C_ontacts..."
 msgstr "_цМЫЯИЛъА"
 
-#: 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
 msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
 #, fuzzy
 msgid "_Job title:"
 msgstr "_лчМУЛА"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
 #, fuzzy
 msgid "_Company:"
 msgstr "аМТИЦЯАЖч"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+msgid "_Address..."
+msgstr ""
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:41
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr ""
 
@@ -654,40 +569,163 @@ msgid "No_tes:"
 msgstr "сГЛЕъЫ_ЛА"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 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/fullname-strings.h:7
-msgid "Check Full Name"
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid "_Title:"
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:9
-msgid "_First:"
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:10
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
 #, fuzzy
-msgid "_Middle:"
+msgid "Company"
+msgstr "аМТИЦЯАЖч"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+#, fuzzy
+msgid "Home"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+#, fuzzy
+msgid "Home 2"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+#, fuzzy
+msgid "Home Fax"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+#, fuzzy
+msgid "Mobile"
 msgstr "_лчМУЛА"
 
-#: addressbook/contact-editor/fullname-strings.h:11
-msgid "_Last:"
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
+msgid "Other"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:12
-msgid "_Suffix:"
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: addressbook/contact-editor/e-contact-editor.c:1280
+#, fuzzy
+msgid "Pager"
+msgstr "еПИЙЭККГСГ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#, fuzzy
+msgid "Primary"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:8
+msgid "Check Address"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:12
+msgid "_Address:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:13
+msgid "_City:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:14
+msgid "_PO Box:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:15
+msgid "_State/Province:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:16
+msgid "_ZIP Code:"
+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/fullname-strings.h:7
+msgid "Check Full Name"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:8
 msgid ""
 "\n"
 "Mr.\n"
@@ -695,7 +733,7 @@ msgid ""
 "Dr.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:18
+#: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
 "\n"
 "Sr.\n"
@@ -706,68 +744,46 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:415
-#: calendar/gui/calendar-commands.c:544
-#, fuzzy
-msgid "New"
-msgstr "_мщО"
-
-#: addressbook/gui/component/addressbook.c:415
-msgid "Create a new contact"
-msgstr ""
-
-#: addressbook/gui/component/addressbook.c:419
-msgid "Find"
+#: addressbook/contact-editor/fullname-strings.h:21
+msgid "_First:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:419
-msgid "Find a contact"
+#: addressbook/contact-editor/fullname-strings.h:22
+msgid "_Title:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:420
-#: addressbook/gui/component/addressbook.c:487
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:43
+#: addressbook/contact-editor/fullname-strings.h:23
 #, fuzzy
-msgid "Print"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: addressbook/gui/component/addressbook.c:420
-#, fuzzy
-msgid "Print contacts"
-msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
+msgid "_Middle:"
+msgstr "_лчМУЛА"
 
-#. Delete
-#: addressbook/gui/component/addressbook.c:421
-#: calendar/gui/event-editor-dialog.glade.h:93 calendar/gui/gncal-todo.c:498
-#: mail/folder-browser-factory.c:45
-msgid "Delete"
+#: addressbook/contact-editor/fullname-strings.h:24
+msgid "_Last:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:421
-#, fuzzy
-msgid "Delete a contact"
-msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
-
-#: addressbook/gui/component/addressbook.c:494
-#: addressbook/gui/component/addressbook.c:1034
-msgid "As _Table"
+#: addressbook/contact-editor/fullname-strings.h:25
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:501
-#, fuzzy
-msgid "_New Contact"
-msgstr "_цМЫЯИЛъА"
+#: addressbook/gui/component/addressbook.c:263
+msgid "As _Minicards"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:509
-msgid "N_ew Directory Server"
+#.
+#. * 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
+msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:588
+#: addressbook/gui/component/addressbook.c:386
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/component/addressbook.c:593
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -776,173 +792,217 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:938
-#: addressbook/gui/minicard/e-minicard.c:329
-msgid "Save as VCard"
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1005
-msgid "* Click here to add a contact *"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#, fuzzy
+msgid "Advanced..."
+msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
 
-#: addressbook/gui/component/addressbook.c:1041
-msgid "As _Minicards"
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "жэЙЕКОР ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
+
+#: addressbook/gui/component/addressbook.c:534
+msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1092
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "лИЙЯэ еИЙОМъДИА"
+
+#: addressbook/gui/component/addressbook.c:621
 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 Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/alphabet.glade.h:7
-msgid "window2"
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
+msgid "Description:"
+msgstr ""
+
+#: po/tmp/ldap-server-dialog.glade.h:7
+msgid "LDAP Server:"
+msgstr ""
+
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr ""
+
+#: po/tmp/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/select-names.glade.h:6
+#, fuzzy
+msgid "Find..."
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: po/tmp/select-names.glade.h:7
+#, fuzzy
+msgid "Message Recipients"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: po/tmp/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/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr ""
 
-#: 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
 msgid "h"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 #, fuzzy
 msgid "o"
 msgstr "пЯОР"
 
-#: addressbook/gui/component/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 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/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "Description:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
-msgid "LDAP Server:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr ""
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
+msgid "Save as VCard"
 msgstr ""
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr ""
+#: addressbook/gui/widgets/e-minicard-control.c:278
+#, fuzzy
+msgid "Save in addressbook"
+msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: addressbook/gui/minicard/e-minicard-view.c:110
+#: addressbook/gui/widgets/e-minicard-view.c:111
 msgid ""
 "\n"
 "\n"
@@ -952,903 +1012,1107 @@ msgid ""
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: po/tmp/e-contact-print.glade.h:9
 #, fuzzy
-msgid "Options"
-msgstr "е_МщЯЦЕИЕР"
+msgid "Body"
+msgstr "счЛЕЯА"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:13
 #, fuzzy
-msgid "Sections:"
-msgstr "е_МщЯЦЕИЕР"
+msgid "Fonts"
+msgstr "цМЫЯИЛъЕР"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
+#: po/tmp/e-contact-print.glade.h:15
+#, fuzzy
+msgid "Format"
+msgstr "аПЭ"
+
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
+#: po/tmp/e-contact-print.glade.h:18
+msgid "Headings"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:19
-#, fuzzy
-msgid "Fonts"
-msgstr "цМЫЯИЛъЕР"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Headings"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:24
-#, fuzzy
-msgid "Body"
-msgstr "счЛЕЯА"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
+#: po/tmp/e-contact-print.glade.h:28
+#, fuzzy
+msgid "Options"
+msgstr "е_МщЯЦЕИЕР"
+
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: po/tmp/e-contact-print.glade.h:30
 #, fuzzy
-msgid "Format"
-msgstr "аПЭ"
+msgid "Page"
+msgstr "еПИЙЭККГСГ"
+
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
+#: po/tmp/e-contact-print.glade.h:32
 #, fuzzy
 msgid "Paper"
 msgstr "еПИЙЭККГСГ"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
+#: po/tmp/e-contact-print.glade.h:33
+msgid "Paper source:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:81
-msgid "label26"
+#: po/tmp/e-contact-print.glade.h:34
+#, fuzzy
+msgid "Portrait"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
+#: po/tmp/e-contact-print.glade.h:38
+msgid "Right:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:35
-msgid "Paper source:"
+#: po/tmp/e-contact-print.glade.h:39
+#, fuzzy
+msgid "Sections:"
+msgstr "е_МщЯЦЕИЕР"
+
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
+#: po/tmp/e-contact-print.glade.h:41
+#, fuzzy
+msgid "Size:"
+msgstr "лщЦЕХОР"
+
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:44
 #, fuzzy
 msgid "Top:"
 msgstr "пЯОР:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:40
-msgid "Right:"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:41
-#, fuzzy
-msgid "Page"
-msgstr "еПИЙЭККГСГ"
-
-#: addressbook/printing/e-contact-print.glade.h:42
-#, fuzzy
-msgid "Size:"
-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 ""
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
+#. 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 ""
 
-#: addressbook/printing/e-contact-print.glade.h:48
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
-msgid "Portrait"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr ""
+msgid "Evolution Calendar Conduit"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
+msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
+msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr ""
+#: calendar/conduits/todo/todo-conduit-control-applet.c:127
+#, fuzzy
+msgid "Evolution ToDo Conduit"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
-msgid "am"
+#: calendar/conduits/todo/todo-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:543
-msgid "pm"
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
+msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:56
+#: calendar/gui/calendar-commands.c:60
 msgid "Outline:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:57
+#: calendar/gui/calendar-commands.c:61
 msgid "Headings:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:58
+#: calendar/gui/calendar-commands.c:62
 msgid "Empty days:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:63
 #, fuzzy
 msgid "Appointments:"
 msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:64
 msgid "Highlighted day:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:65
 msgid "Day numbers:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:66
 msgid "Current day's number:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is due today:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:69
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:175
-#, fuzzy
-msgid "Gnome Calendar"
-msgstr "гЛЕЯОКЭЦИО"
-
-#: calendar/gui/calendar-commands.c:178
-msgid "The GNOME personal calendar and schedule manager."
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:378
 #, fuzzy
 msgid "Open calendar"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:417
 #, fuzzy
 msgid "Save calendar"
 msgstr "тО ГЛЕЯОКЭЦИЭ САР"
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:712
-#: calendar/gui/gncal-todo.c:716
-msgid "Day"
+#. strftime format of a weekday and a date.
+#: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+msgid "%a %m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:522
-msgid "Show 1 day"
+#. 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
+msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:525
-msgid "5 Days"
+#. 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
+msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:525
-msgid "Show the working week"
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
+msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:711
-msgid "Week"
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
+#, fuzzy
+msgid "Private"
+msgstr "еПИЙЭККГСГ"
+
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
+msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:528
-msgid "Show 1 week"
+#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:531
-#, fuzzy
-msgid "Month"
-msgstr "цМЫЯИЛъЕР"
+#: calendar/gui/calendar-model.c:441
+msgid "N"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:531
-msgid "Show 1 month"
+#: calendar/gui/calendar-model.c:441
+msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:535
-msgid "Year"
+#: calendar/gui/calendar-model.c:443
+msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:535
-msgid "Show 1 year"
+#: calendar/gui/calendar-model.c:443
+msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:682
-msgid "Create a new appointment"
+#: calendar/gui/calendar-model.c:515
+msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
-#, fuzzy
-msgid "Print this calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+#: calendar/gui/calendar-model.c:518
+msgid "Opaque"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:552
-msgid "Prev"
+#: calendar/gui/calendar-model.c:744
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:552
-msgid "Go back in time"
+#. strptime format for a date.
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+msgid "%m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:553
-#, fuzzy
-msgid "Today"
-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
+msgid "%I:%M:%S %p%n"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:553
-msgid "Go to present time"
+#. strptime format for a time of day, in 24-hour format.
+#: calendar/gui/calendar-model.c:866
+msgid "%H:%M:%S%n"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:554 filter/filter-editor.c:210
-msgid "Next"
+#. 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
+msgid "%I:%M %p%n"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:554
-msgid "Go forward in time"
+#. strptime format for time of day, without seconds 24-hour format.
+#: calendar/gui/calendar-model.c:873
+msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:558
-msgid "Go to"
+#: calendar/gui/calendar-model.c:993
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:558
-msgid "Go to a specific date"
+#: calendar/gui/calendar-model.c:1033
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1073
+msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#. file menu
-#: calendar/gui/calendar-commands.c:659
+#: calendar/gui/control-factory.c:125
 #, fuzzy
-msgid "New Ca_lendar"
-msgstr "гЛЕЯОКЭЦИО"
+msgid "The URI that the calendar will display"
+msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
 
-#: calendar/gui/calendar-commands.c:660
-msgid "Create a new calendar"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:663
-#, fuzzy
-msgid "Open Ca_lendar"
-msgstr "гЛЕЯОКЭЦИО"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:664
-#, fuzzy
-msgid "Open a calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+msgid "No summary available."
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
-#, fuzzy
-msgid "Save Calendar As"
-msgstr "гЛЕЯОКЭЦИО"
+#.
+#. * 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
+msgid "Close"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:673
+#: po/tmp/alarm-notify.glade.h:7
 #, fuzzy
-msgid "Print..."
-msgstr "пЯОТЕЯАИЭТГТА"
+msgid "Edit appointment"
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/calendar-commands.c:682
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
 #, fuzzy
-msgid "_New appointment..."
-msgstr "я_АМТЕБОЩ"
+msgid "Snooze"
+msgstr "лщЦЕХОР"
 
-#: calendar/gui/calendar-commands.c:687
-msgid "New appointment for _today..."
+#: po/tmp/alarm-notify.glade.h:9
+msgid "Snooze time (minutes)"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:688
-msgid "Create a new appointment for today"
+#.
+#. * 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
+msgid "05 minutes"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:696 calendar/gui/prop.c:712
-msgid "Preferences"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:703 calendar/gui/calendar-commands.c:704
-#, fuzzy
-msgid "About Calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr ""
 
-#. i18n: This "%s%s" indicates possession. Languages where the order is
-#. * the inverse should translate it to "%2$s%1$s".
-#.
-#: calendar/gui/calendar-commands.c:746
-#, c-format
-msgid "%s%s"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:746
-#, fuzzy
-msgid "'s calendar"
-msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:68
-msgid "Specifies the port on which the Pilot is"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:68
-msgid "PORT"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:70
-msgid "If you want to debug the attributes on records"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:72
-msgid "Only syncs from desktop to pilot"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:74
-msgid "Only syncs from pilot to desktop"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:97
-msgid "Can not create Pilot socket\n"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Calendar"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:104
-#, c-format
-msgid "Can not bind to device %s\n"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:107
-msgid "Failed to get a connection from the Pilot device"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:111
-msgid "pi_accept failed"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:211
-msgid ""
-"\tObject has been modified on desktop and on the pilot, desktop takes "
-"precedence\n"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:531
-msgid "No description"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:692
-msgid "Could not open DatebookDB on the Pilot"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:693
-msgid "Unable to open DatebookDB"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:728
-msgid "Synced DateBook from Pilot to GnomeCal"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/control-factory.c:136
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr ""
+
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
 #, fuzzy
-msgid "The URI that the calendar will display"
-msgstr "тО URI ПОУ ХА ЕЛЖАМъСЕИ О еНЕЯЕУМГТчР жАЙщККЫМ"
+msgid "Friday"
+msgstr "пЯОТЕЯАИЭТГТА"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:181
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:188
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
 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.
-#.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-msgid "Close"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1056
-#, fuzzy
-msgid "Snooze"
-msgstr "лщЦЕХОР"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: po/tmp/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
+msgid "Mon"
+msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
 #, fuzzy
-msgid "Edit appointment"
-msgstr "я_АМТЕБОЩ"
+msgid "Monday"
+msgstr "счЛЕЯА"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
-msgid "Snooze time (minutes)"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:391
-#, c-format
-msgid "%02i minute divisions"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
 msgstr ""
 
-#: 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/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "New appointment..."
-msgstr "я_АМТЕБОЩ"
+msgid "Saturday"
+msgstr "аПОСТОКч"
 
-#: 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
-msgid "Edit this appointment..."
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2322 calendar/gui/e-week-view.c:2648
+#: po/tmp/cal-prefs-dialog.glade.h:45
 #, fuzzy
-msgid "Delete this appointment"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Show appointment end times"
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/e-day-view.c:2329 calendar/gui/e-week-view.c:2655
-msgid "Make this appointment movable"
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2330 calendar/gui/e-week-view.c:2656
+#: po/tmp/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
+msgid "Sun"
+msgstr ""
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
 #, fuzzy
-msgid "Delete this occurrence"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Sunday"
+msgstr "аПОСТОКч"
 
-#: calendar/gui/e-day-view.c:2331 calendar/gui/e-week-view.c:2657
-msgid "Delete all occurrences"
+#: po/tmp/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
+msgid "Thu"
 msgstr ""
 
-#: calendar/gui/event-editor.c:289
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
 #, fuzzy
-msgid "Edit Appointment"
-msgstr "я_АМТЕБОЩ"
+msgid "Thursday"
+msgstr "счЛЕЯА"
 
-#: calendar/gui/event-editor.c:294
-msgid "No summary"
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/event-editor.c:298
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "я_АМТЕБОЩ"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr ""
 
-#: calendar/gui/event-editor.c:301
-#, fuzzy, c-format
-msgid "Task - %s"
-msgstr "еЙЙЯЕЛЭТГТЕР"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr ""
 
-#: calendar/gui/event-editor.c:304
-#, fuzzy, c-format
-msgid "Journal entry - %s"
-msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr ""
+
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+#, fuzzy
+msgid "Tuesday"
+msgstr "счЛЕЯА"
 
-#. Owner, summary
-#: calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
-msgid "?"
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1215
-msgid "FIXME: Ca_lendar..."
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1250
-msgid "FIXME: Chec_k Names"
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1251
-msgid "FIXME: Address _Book..."
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1258
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:63
 #, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "я_АМТЕБОЩ"
+msgid "seconds."
+msgstr "аПОСТОКч"
 
-#: calendar/gui/event-editor.c:1260
-msgid "FIXME: Rec_urrence..."
+#.
+#. * 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
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1262
-msgid "FIXME: Intive _Attendees..."
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1263
-msgid "FIXME: C_ancel Invitation..."
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1265
-msgid "FIXME: Forward as v_Calendar"
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Save and Close"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1330
-msgid "FIXME: Recurrence..."
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1331
-msgid "Configure recurrence rules"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1333
-msgid "FIXME: Invite Attendees..."
+#: po/tmp/task-editor-dialog.glade.h:16
+msgid "Low"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1334
-msgid "Invite attendees to a meeting"
+#. 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
+#, fuzzy
+msgid "None"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Normal"
+msgstr "аПЭ"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1745
-msgid "%a %b %d %Y"
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
 msgstr ""
 
-#. todo
-#.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
+#: po/tmp/task-editor-dialog.glade.h:24
+#, fuzzy
+msgid "Task"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
+
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "_Owner:"
+#: po/tmp/task-editor-dialog.glade.h:26
+#, fuzzy
+msgid "_Contacts..."
+msgstr "_цМЫЯИЛъА"
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Time"
+#: po/tmp/task-editor-dialog.glade.h:28
+#, fuzzy
+msgid "_Priority:"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "Start time:"
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "End time:"
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "A_ll day event"
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14 calendar/gui/prop.c:780
-msgid "Alarms"
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "я_АМТЕБОЩ"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "еЙЙЯЕЛЭТГТЕР"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
+#: calendar/gui/e-calendar-table.c:336
+#, fuzzy
+msgid "Open..."
+msgstr "╤МОИ_ЦЛА"
+
+#: calendar/gui/e-calendar-table.c:337
+msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Display"
+#: calendar/gui/e-calendar-table.c:339
+msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Audio"
+#: calendar/gui/e-calendar-table.c:340
+msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "_Program"
+#: 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/event-editor-dialog.glade.h:34
+#: calendar/gui/e-calendar-table.c:343
 #, fuzzy
-msgid "_Mail"
-msgstr "_лчМУЛА"
+msgid "Delete the task"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "Mail _to:"
+#: calendar/gui/e-day-view-time-item.c:516
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Run program:"
+#. 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-week-view-main-item.c:325
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "Classification"
+#. 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-week-view-main-item.c:334
+msgid "%a %d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Pu_blic"
+#. 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-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: 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
 #, fuzzy
-msgid "Pri_vate"
-msgstr "еПИЙЭККГСГ"
+msgid "New appointment..."
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "_Confidential"
+#: 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
+msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "Recurrence rule"
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/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
+msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43 shell/e-shell-view.c:596
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 #, fuzzy
-msgid "None"
-msgstr "сГЛЕъЫ_ЛА"
+msgid "Delete this occurrence"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Daily"
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+msgid "Delete all occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Weekly"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Monthly"
+#.
+#. * 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
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Yearly"
+#: po/tmp/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "я_АМТЕБОЩ"
+
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "label23"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:82
-msgid "Every "
+#: po/tmp/event-editor-dialog.glade.h:11
+#, fuzzy
+msgid "Days"
+msgstr "пЯЭВЕИЯА"
+
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "day(s)"
+#: po/tmp/event-editor-dialog.glade.h:14
+#, fuzzy
+msgid "Exceptions"
+msgstr "е_МщЯЦЕИЕР"
+
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:51
-msgid "label24"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:53
-msgid "week(s)"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
+#: po/tmp/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Modify"
+msgstr "счЛЕЯА"
+
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
+#: po/tmp/event-editor-dialog.glade.h:22
+#, fuzzy
+msgid "Pri_vate"
+msgstr "еПИЙЭККГСГ"
+
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
 msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/event-editor-dialog.glade.h:60
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-msgid "label25"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:62
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "Recur on the"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid "th day of the month"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:71
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:79
-msgid "Every"
+#: po/tmp/event-editor-dialog.glade.h:33
+#, fuzzy
+msgid "_End time:"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
+
+#: po/tmp/event-editor-dialog.glade.h:34
+#, fuzzy
+msgid "_Mail"
+msgstr "_лчМУЛА"
+
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:80
+#: po/tmp/event-editor-dialog.glade.h:37
 #, fuzzy
-msgid "month(s)"
-msgstr "цМЫЯИЛъЕР"
+msgid "_Start time:"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
 
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "year(s)"
+#: po/tmp/event-editor-dialog.glade.h:38
+msgid "_Starting date:"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:84
-msgid "label27"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Ending date"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "Repeat forever"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "End on "
+#: po/tmp/event-editor-dialog.glade.h:44
+#, fuzzy
+msgid "month(s)"
+msgstr "цМЫЯИЛъЕР"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "End after"
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "occurrence(s)"
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:90
+#: calendar/gui/event-editor.c:329
 #, fuzzy
-msgid "Exceptions"
-msgstr "е_МщЯЦЕИЕР"
+msgid "Edit Appointment"
+msgstr "я_АМТЕБОЩ"
 
-#: calendar/gui/event-editor-dialog.glade.h:92
+#: calendar/gui/event-editor.c:407
 #, fuzzy
-msgid "Change"
-msgstr "еПИЙЭККГСГ"
+msgid "on"
+msgstr "пЯОР"
 
-#: calendar/gui/event-editor-dialog.glade.h:94
-msgid "Recurrence"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:559
+#, fuzzy
+msgid "on the"
+msgstr "цМЫЯИЛъЕР"
+
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr ""
+
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: calendar/gui/event-editor.c:839
+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
+msgid "%a %b %d %Y"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -1950,11 +2214,11 @@ msgstr ""
 msgid "saturday"
 msgstr ""
 
-#: calendar/gui/getdate.y:420
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr ""
 
-#: calendar/gui/getdate.y:421
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 #, fuzzy
 msgid "month"
 msgstr "цМЫЯИЛъЕР"
@@ -1963,19 +2227,15 @@ msgstr "цМЫЯИЛъЕР"
 msgid "fortnight"
 msgstr ""
 
-#: calendar/gui/getdate.y:423
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr ""
 
-#: calendar/gui/getdate.y:424
-msgid "day"
-msgstr ""
-
-#: calendar/gui/getdate.y:425
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr ""
 
-#: calendar/gui/getdate.y:426
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr ""
 
@@ -1983,7 +2243,7 @@ msgstr ""
 msgid "min"
 msgstr ""
 
-#: calendar/gui/getdate.y:428
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 #, fuzzy
 msgid "second"
 msgstr "аПОСТОКч"
@@ -2005,7 +2265,8 @@ msgstr ""
 msgid "today"
 msgstr "счЛЕЯА"
 
-#: calendar/gui/getdate.y:438
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr ""
 
@@ -2073,115 +2334,29 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:137
-msgid "Create to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:137
-msgid "Edit to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:171
-msgid "Summary:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:181
-msgid "Due Date:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:190
-#, fuzzy
-msgid "Priority:"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: calendar/gui/gncal-todo.c:206
-msgid "Item Comments:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:324
-msgid "Add to-do item..."
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:325
-msgid "Edit this item..."
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:424
-msgid "Summary"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:425 calendar/gui/prop.c:604
-msgid "Due Date"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:426 calendar/gui/prop.c:605
-#: mail/message-list.c:474
-msgid "Priority"
-msgstr "пЯОТЕЯАИЭТГТА"
-
-#: calendar/gui/gncal-todo.c:427
-msgid "Time Left"
-msgstr ""
-
-#. Label
-#: calendar/gui/gncal-todo.c:439
-#, fuzzy
-msgid "To-do list"
-msgstr "е_ЯЦАКЕъА"
-
-#. Add
-#: calendar/gui/gncal-todo.c:478
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr ""
-
-#. Edit
-#: calendar/gui/gncal-todo.c:487
-msgid "Edit..."
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:711
-msgid "Weeks"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:712 calendar/gui/gncal-todo.c:716
-#, fuzzy
-msgid "Days"
-msgstr "пЯЭВЕИЯА"
-
-#: calendar/gui/gncal-todo.c:717 calendar/gui/gncal-todo.c:721
-msgid "Hours"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:717 calendar/gui/gncal-todo.c:721
-msgid "Hour"
+#: 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/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
-msgid "Minutes"
+#: calendar/gui/gnome-cal.c:1152
+#, c-format
+msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
-msgid "Minute"
+#: calendar/gui/gnome-cal.c:1163
+#, c-format
+msgid "Could not create a calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
-#, fuzzy
-msgid "Seconds"
-msgstr "е_МщЯЦЕИЕР"
-
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
-#, fuzzy
-msgid "Second"
-msgstr "аПОСТОКч"
-
-#: calendar/gui/gnome-cal.c:453 calendar/gui/gnome-cal.c:1064
-#: calendar/gui/gnome-cal.c:1120
-msgid "Reminder of your appointment at "
+#: 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:1069 calendar/gui/gnome-cal.c:1124
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr ""
 
@@ -2189,518 +2364,1079 @@ msgstr ""
 msgid "Year:"
 msgstr ""
 
-#: calendar/gui/goto.c:264
+#: calendar/gui/goto.c:270
 msgid "Go to date"
 msgstr ""
 
 #. Instructions
-#: calendar/gui/goto.c:275
+#: 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:312
+#: calendar/gui/goto.c:318
 msgid "Go to today"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "26th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "27th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "28th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "29th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "30th"
 msgstr ""
 
-#: calendar/gui/print.c:271
+#: calendar/gui/print.c:294
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 #, fuzzy
 msgid "Fr"
 msgstr "аПЭ"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:868
-msgid "TODO Items"
-msgstr ""
+#: calendar/gui/print.c:936
+#, fuzzy
+msgid "Tasks"
+msgstr "еЙЙЯЕЛЭ_ТГТА"
 
 #. Day
-#: calendar/gui/print.c:980
+#: calendar/gui/print.c:1066
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1000 calendar/gui/print.c:1014
-#: calendar/gui/print.c:1015
-msgid "%a"
-msgstr ""
-
-#: calendar/gui/print.c:1001 calendar/gui/print.c:1002
-#: calendar/gui/print.c:1016 calendar/gui/print.c:1017
-msgid "%b"
-msgstr ""
-
-#: calendar/gui/print.c:1004
-#, c-format
-msgid "Current week (%s %s %d - %s %d %d)"
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1021
-#, c-format
-msgid "Current week (%s %s %d - %s %s %d %d)"
+#: calendar/gui/print.c:1081
+msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1027
+#: calendar/gui/print.c:1092
 #, c-format
-msgid "Current week (%s %s %d %d - %s %s %d %d)"
+msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1040
-msgid "Current month (%a %Y)"
+#: calendar/gui/print.c:1100
+msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1047
+#: calendar/gui/print.c:1107
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1084
+#: calendar/gui/print.c:1144
 #, fuzzy
 msgid "Print Calendar"
 msgstr "гЛЕЯОКЭЦИО"
 
-#: calendar/gui/print.c:1249
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/prop.c:330
-msgid "Time display"
+#. 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 ""
 
-#. Time format
-#: calendar/gui/prop.c:334
-msgid "Time format"
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/gui/prop.c:335
-msgid "12-hour (AM/PM)"
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, fuzzy, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: calendar/gui/prop.c:336
-msgid "24-hour"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#. Weeks start on
-#: calendar/gui/prop.c:346
-msgid "Weeks start on"
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: calendar/gui/prop.c:347
-#, fuzzy
-msgid "Sunday"
-msgstr "аПОСТОКч"
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr ""
 
-#: calendar/gui/prop.c:348
-#, fuzzy
-msgid "Monday"
-msgstr "счЛЕЯА"
+#: camel/camel-movemail.c:146
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:156
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:197
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:243
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:254
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:272
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:304
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:316
+#, c-format
+msgid "Could not fork: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:354
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:355
+msgid "(Unknown error)"
+msgstr ""
+
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
+msgstr ""
+
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr ""
+
+#: camel/camel-remote-store.c:182
+#, c-format
+msgid "%s server %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:186
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:227
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:228
+msgid "(unknown host)"
+msgstr ""
+
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr ""
 
-#. Day range
-#: calendar/gui/prop.c:358
-msgid "Day range"
+#: camel/camel-service.c:129
+#, c-format
+msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: calendar/gui/prop.c:369
+#: camel/camel-service.c:138
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr ""
+
+#: camel/camel-service.c:488
+#, c-format
+msgid "No such host %s."
+msgstr ""
+
+#: camel/camel-service.c:491
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr ""
+
+#: camel/camel-session.c:272
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
+#: camel/camel-session.c:360
+#, c-format
 msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
+"Could not create directory %s:\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/prop.c:385
-msgid "Day start:"
+#: camel/camel-url.c:78
+#, c-format
+msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: calendar/gui/prop.c:396
-msgid "Day end:"
+#: camel/camel-url.c:93
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: calendar/gui/prop.c:519
-msgid "Colors for display"
+#: camel/camel-url.c:154
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: calendar/gui/prop.c:522
-msgid "Colors"
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/prop.c:599
-msgid "Show on TODO List:"
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
 msgstr ""
 
-#: calendar/gui/prop.c:606
-msgid "Time Until Due"
+#: camel/providers/imap/camel-imap-command.c:216
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:637
-msgid "To Do List style options:"
+#: camel/providers/imap/camel-imap-command.c:224
+#, c-format
+msgid "IMAP command failed: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:642
-msgid "Highlight overdue items"
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+msgid "Unknown error"
 msgstr ""
 
-#: calendar/gui/prop.c:645
-msgid "Highlight not yet due items"
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
 msgstr ""
 
-#: calendar/gui/prop.c:648
-msgid "Highlight items due today"
+#: camel/providers/imap/camel-imap-command.c:407
+#, c-format
+msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: calendar/gui/prop.c:678
-msgid "To Do List Properties"
+#: camel/providers/imap/camel-imap-command.c:443
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:681
-msgid "To Do List"
+#: camel/providers/imap/camel-imap-folder.c:216
+#, c-format
+msgid "Could not load summary for %s"
 msgstr ""
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:783
-#, fuzzy
-msgid "Alarm Properties"
-msgstr "еПИСЩМАЬГ"
+#: camel/providers/imap/camel-imap-folder.c:586
+msgid "Could not find message body in FETCH response."
+msgstr ""
 
-#: calendar/gui/prop.c:793
-msgid "Beep on display alarms"
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
 msgstr ""
 
-#: calendar/gui/prop.c:803
-msgid "Audio alarms timeout after"
+#: camel/providers/imap/camel-imap-provider.c:41
+msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: calendar/gui/prop.c:814 calendar/gui/prop.c:831
-msgid " seconds"
+#: 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 ""
 
-#: calendar/gui/prop.c:820
-msgid "Enable snoozing for "
+#: camel/providers/imap/camel-imap-store.c:236
+msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/prop.c:836
-msgid "Defaults"
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:766
-msgid "Cut"
-msgstr "йОПч"
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:184
-msgid "Cut selected item into clipboard"
-msgstr "йОПч ЕПИКЕЦЛщМОУ АМТИЙЕИЛщМОУ СТО ПЯЭВЕИЯО"
+#: camel/providers/imap/camel-imap-store.c:333
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:767
-msgid "Copy"
-msgstr "аМТИЦЯАЖч"
+#: camel/providers/imap/camel-imap-store.c:359
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:188
-msgid "Copy selected item into clipboard"
-msgstr "аМТИЦЯАЖч ЕПИКЕЦЛщМОУ АМТИЙЕИЛщМОУ СТО ПЯЭВЕИЯО"
+#: camel/providers/imap/camel-imap-store.c:539
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:768
-msgid "Paste"
-msgstr "еПИЙЭККГСГ"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:192
-#: composer/e-msg-composer-address-dialog.c:200
-msgid "Paste item from clipboard"
-msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:528
-msgid "Select recipients' addresses"
-msgstr "еПИКщНТЕ ТГ ДИЕЩХУМСГ ТОУ ПАЯАКчПТГ"
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+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.
-#.
-#: composer/e-msg-composer-address-dialog.glade.h:7
-msgid "Recipient list:"
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:9
-msgid "Search..."
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:10
-msgid "Name"
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:11
-msgid "Address"
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:12
-#, fuzzy
-msgid "Properties..."
-msgstr "иДИЭТГТЕР"
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:14
-#, fuzzy
-msgid "To: >>"
-msgstr "пЯОР:"
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:15
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
 #, fuzzy
-msgid "Cc: >>"
-msgstr "аМТъЦЯАЖО:"
+msgid "No such message"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, fuzzy, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:117
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:160
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:234
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:341
+#, 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
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:491
+#, 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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:562
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:579
+#, 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
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:604
+#, fuzzy, c-format
+msgid "Could not close temp folder: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-mbox-summary.c:615
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:817
+#, c-format
+msgid "Unknown error: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: camel/providers/local/camel-mh-store.c:116
+#, c-format
+msgid "`%s' is not a directory."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: 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:144
+#, fuzzy, c-format
+msgid "Message %s not found."
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:179
+msgid "Could not open folder: message listing was incomplete."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:273
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:150
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:160
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:172
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:217
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:335
+#, c-format
+msgid "Could not connect to POP server on %s."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:389
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, 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
+msgid "(Unknown)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:438
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:16
+#: camel/providers/pop3/camel-pop3-store.c:446
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:555
+#, c-format
+msgid "No such folder `%s'."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
 #, fuzzy
-msgid "Bcc: >>"
-msgstr "йЯУЖЭ АМТъЦЯАЖО:"
+msgid "Sendmail"
+msgstr "аПОСТОКч"
 
-#: composer/e-msg-composer-address-dialog.glade.h:17
-msgid "label9"
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:18
-msgid "label7"
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:19
-msgid "label8"
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, fuzzy, c-format
+msgid "Could not send message: %s"
+msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:76
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+msgid "sendmail"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:30
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:78
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u byte"
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:93
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:299
-msgid "Add attachment"
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#, fuzzy
+msgid "attachment"
 msgstr "мЕА ЕПИСЩМАЬГ"
 
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:332
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/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
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "дИАЦЯАЖч"
 
-#: composer/e-msg-composer-attachment-bar.c:363
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "дИАЦЯАЖч ЕПИКЕЦЛщМЫМ АМТИЙЕИЛщМЫМ АПЭ ТОМ ЙАТэКОЦО ЕПИСУМэЬЕЫМ"
 
-#: composer/e-msg-composer-attachment-bar.c:394
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "мщА ЕПИСЩМАЬГ..."
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 #, fuzzy
 msgid "Attachment properties"
 msgstr "еПИСЩМАЬГ"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
+#: po/tmp/e-msg-composer-attachment.glade.h:8
+msgid "File name:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:10
-msgid "File name:"
+#: po/tmp/e-msg-composer-attachment.glade.h:9
+msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:174
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:621
+#, fuzzy
+msgid "From:"
+msgstr "аПЭ"
+
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "йКъЙ ЕДЧ ЦИА ТО ДИЕУХУМСИОКЭЦИО"
 
-#: composer/e-msg-composer-hdrs.c:216
+#: composer/e-msg-composer-hdrs.c:291
+#, 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
 msgid "To:"
 msgstr "пЯОР:"
 
-#: composer/e-msg-composer-hdrs.c:217
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:221
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "аМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:222
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "еИСэЦЕТЕ ТИР ДИЕУХЩМСЕИР ЭПОУ ХА СТАКЕъ АМТъЦЯАЖО ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer-hdrs.c:227
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "йЯУЖЭ АМТъЦЯАЖО:"
 
-#: composer/e-msg-composer-hdrs.c:228
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2708,276 +3444,881 @@ msgstr ""
 "еИСэЦЕТЕ ТИР ДИЕУХЩМСЕИР ЭПОУ ХА СТАКЕъ АМТъЦЯАЖО ТОУ ЛГМЩЛАТОР ВЫЯъР АУТщР "
 "МА ЕЛЖАМИСТОЩМ СТОМ ЙАТэКОЦО ПАЯАКГПТЧМ ТОУ ЛГМЩЛАТОР."
 
-#: composer/e-msg-composer-hdrs.c:234
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "хщЛА:"
 
-#: composer/e-msg-composer-hdrs.c:235
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "еИСэЦЕТЕ ТО ХщЛА ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:463
+#: composer/e-msg-composer.c:429
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:474
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:494
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:652
 #, fuzzy
-msgid "Discard this message?"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Saving changes to message..."
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:561
+#: composer/e-msg-composer.c:654
+#, fuzzy
+msgid "Save changes to message..."
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: composer/e-msg-composer.c:695
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+msgid "Evolution"
+msgstr ""
+
+#: composer/e-msg-composer.c:745
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: composer/e-msg-composer.c:767
 #, fuzzy
 msgid "Open file"
 msgstr "╤МОИЦЛА жАЙщККОУ"
 
-#: composer/e-msg-composer.c:718
-msgid "Save in _folder..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+#: composer/e-msg-composer.c:893
+msgid "That file does not exist."
+msgstr ""
 
-#: composer/e-msg-composer.c:718
-msgid "Save the message in a specified folder"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+#: composer/e-msg-composer.c:903
+msgid "That is not a regular file."
+msgstr ""
 
-#: composer/e-msg-composer.c:721 composer/e-msg-composer.c:763
-msgid "Send"
-msgstr "аПОСТОКч"
+#: composer/e-msg-composer.c:913
+msgid "That file exists but is not readable."
+msgstr ""
 
-#: composer/e-msg-composer.c:721
-msgid "Send the message"
-msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+#: composer/e-msg-composer.c:923
+msgid "That file appeared accesible but open(2) failed."
+msgstr ""
 
-#: composer/e-msg-composer.c:733
-msgid "View _attachments"
-msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+#: composer/e-msg-composer.c:945
+msgid ""
+"The file is very large (more than 100K).\n"
+"Are you sure you wish to insert it?"
+msgstr ""
 
-#: composer/e-msg-composer.c:733
-msgid "View/hide attachments"
-msgstr "еЛЖэМИСГ/АПЭЙЯУЬГ ЕПИСУМэЬЕЫМ"
+#: composer/e-msg-composer.c:966
+msgid "An error occurred while reading the file."
+msgstr ""
 
-#: composer/e-msg-composer.c:763
-msgid "Send this message"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+#: composer/e-msg-composer.c:1343
+#, fuzzy
+msgid "Compose a message"
+msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
 
-#: composer/e-msg-composer.c:766
-msgid "Cut selected region into the clipboard"
-msgstr "йОПч ЕПИКЕЦЛщМГР ПЕЯИОВчР СТО ПЯЭВЕИЯО"
+#: composer/e-msg-composer.c:1420
+msgid "Could not create composer window."
+msgstr ""
 
-#: composer/e-msg-composer.c:767
-msgid "Copy selected region into the clipboard"
-msgstr "аМТИЦЯАЖч ЕПИКЕЦЛщМГР ПЕЯИОВчР СТО ПЯЭВЕИЯО"
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: composer/e-msg-composer.c:768
-msgid "Paste selected region into the clipboard"
-msgstr "еПИЙЭККГСГ ЕПИКЕЦЛщМГР ПЕЯИОВчР АПЭ ТО ПЯЭВЕИЯО"
+#: filter/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr ""
 
-#: composer/e-msg-composer.c:769
-msgid "Undo"
-msgstr "аЙЩЯЫСГ"
+#: filter/filter-datespec.c:62
+msgid "years"
+msgstr ""
 
-#: composer/e-msg-composer.c:769
-msgid "Undo last operation"
-msgstr "аЙЩЯЫСГ ТЕКЕУТАъАР КЕИТОУЯЦъАР"
+#: filter/filter-datespec.c:63
+#, fuzzy
+msgid "months"
+msgstr "цМЫЯИЛъЕР"
 
-#: composer/e-msg-composer.c:772
-msgid "Attach"
-msgstr "еПИСЩМАЬГ"
+#: filter/filter-datespec.c:64
+msgid "weeks"
+msgstr ""
 
-#: composer/e-msg-composer.c:772
-msgid "Attach a file"
-msgstr "еПИСЩМАЬГ АЯВЕъОУ"
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "days"
+msgstr "пЯЭВЕИЯА"
+
+#: filter/filter-datespec.c:66
+msgid "hours"
+msgstr ""
 
-#: composer/e-msg-composer.c:948
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr ""
+
+#: filter/filter-datespec.c:68
 #, fuzzy
-msgid "Compose a message"
-msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+msgid "seconds"
+msgstr "аПОСТОКч"
+
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
 
-#: filter/filter-editor.c:198
+#: filter/filter-datespec.c:259
+msgid ""
+"The message's date will be compared against\n"
+"whatever the time is when the filter is run\n"
+"or vfolder is opened."
+msgstr ""
+
+#: filter/filter-datespec.c:282
+msgid ""
+"The message's date will be compared against\n"
+"the time that you specify here."
+msgstr ""
+
+#: filter/filter-datespec.c:322
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when the filter is run;\n"
+"\"a week ago\", for example."
+msgstr ""
+
+#. keep in sync with FilterDatespec_type!
+#: filter/filter-datespec.c:357
+msgid "the current time"
+msgstr ""
+
+#: filter/filter-datespec.c:357
+msgid "a time you specify"
+msgstr ""
+
+#: filter/filter-datespec.c:358
+msgid "a time relative to the current time"
+msgstr ""
+
+#. The label
+#: filter/filter-datespec.c:416
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter-datespec.c:690
+msgid "<click here to select a date>"
+msgstr ""
+
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 #, fuzzy
-msgid "Edit Filter"
+msgid "Add Filter Rule"
 msgstr "_жэЙЕККОР"
 
-#: filter/filter-editor.c:198
-msgid "Create filter"
+#: filter/filter-editor.c:233
+#, fuzzy
+msgid "Edit Filter Rule"
+msgstr "_жэЙЕККОР"
+
+#: filter/filter-editor.c:433
+msgid "incoming"
 msgstr ""
 
-#: filter/filter-editor.c:209
-msgid "Back"
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:211
-msgid "Finish"
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#, fuzzy
+msgid "Edit Filters"
+msgstr "_жэЙЕККОР"
+
+#. and now for the action area
+#: filter/filter-filter.c:401
+msgid "Then"
 msgstr ""
 
-#: filter/filter-editor.c:212
-msgid "Cancel"
+#: filter/filter-filter.c:414
+#, fuzzy
+msgid "Add action"
+msgstr "е_МщЯЦЕИЕР"
+
+#: filter/filter-filter.c:420
+#, fuzzy
+msgid "Remove action"
+msgstr "дИАЦЯАЖч оЛэДАР"
+
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-editor.c:216
-msgid "Apply"
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#, fuzzy
+msgid "Select Folder"
+msgstr "_мщОР жэЙЕККОР"
+
+#: filter/filter-folder.c:243
+msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-editor.c:233
+#: filter/filter-folder.c:289
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: filter/filter-input.c:184
+#, c-format
 msgid ""
-"<h2>Create Filtering Rule</h2><p>Select one of the base rules above, then "
-"continue forwards to customise it.</p>"
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
 msgstr ""
 
-#: mail/component-factory.c:196
+#: filter/filter-part.c:456
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:520
+#, fuzzy
+msgid "Rule name: "
+msgstr "лЕТОМОЛАСъА оЛэДАР"
+
+#: filter/filter-rule.c:524
+msgid "Untitled"
+msgstr ""
+
+#: filter/filter-rule.c:540
+msgid "If"
+msgstr ""
+
+#: filter/filter-rule.c:557
+#, fuzzy
+msgid "Execute actions"
+msgstr "е_МщЯЦЕИЕР"
+
+#: filter/filter-rule.c:561
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:566
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:577
+msgid "Add criterion"
+msgstr ""
+
+#: filter/filter-rule.c:583
+#, 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"
+msgstr ""
+
+#: po/tmp/filter.glade.h:10
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "_жэЙЕККОР"
+
+#: po/tmp/filter.glade.h:11
+#, fuzzy
+msgid "Filter Rules"
+msgstr "_жэЙЕККОР"
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr ""
+
+#: po/tmp/filter.glade.h:15
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "_жэЙЕККОР"
+
+#: po/tmp/filter.glade.h:16
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Colour"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:4
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Date received"
+msgstr "еКчЖХГ"
+
+#: filter/libfilter-i18n.h:6
+#, 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 "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: filter/libfilter-i18n.h:12
+msgid "Message was received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:13
+#, fuzzy
+msgid "Message was sent"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: filter/libfilter-i18n.h:14
+#, fuzzy
+msgid "Move to Folder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: filter/libfilter-i18n.h:16
+msgid "Recipients"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+#, fuzzy
+msgid "Sender"
+msgstr "аПОСТОКч"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "йАТэСТАСГ СЩМДЕСГР"
+
+#: filter/libfilter-i18n.h:20
+#, fuzzy
+msgid "Source"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: filter/libfilter-i18n.h:21
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "йАТэСТАСГ СЩМДЕСГР"
+
+#: filter/libfilter-i18n.h:23
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:24
+msgid "Subject"
+msgstr "хщЛА"
+
+#: filter/libfilter-i18n.h:25
+#, fuzzy
+msgid "after"
+msgstr "еПИЙЭККГСГ"
+
+#: filter/libfilter-i18n.h:26
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "contains"
+msgstr "е_МщЯЦЕИЕР"
+
+#: filter/libfilter-i18n.h:28
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
+msgid "is greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+msgid "is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:39
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:40
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "was after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "was before"
+msgstr ""
+
+#: filter/score-editor.c:127
+#, fuzzy
+msgid "Add Rule"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: filter/score-editor.c:166
+msgid "Edit Score Rule"
+msgstr ""
+
+#: filter/score-rule.c:192 filter/score-rule.c:194
+msgid "Score"
+msgstr ""
+
+#: filter/vfolder-editor.c:155
+msgid "Add VFolder Rule"
+msgstr ""
+
+#: filter/vfolder-editor.c:204
+#, fuzzy
+msgid "Edit VFolder Rule"
+msgstr "_жэЙЕККОР"
+
+#: mail/component-factory.c:227
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
-#: mail/folder-browser-factory.c:29
-msgid "Get mail"
+#: mail/component-factory.c:266
+msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser-factory.c:29
-msgid "Check for new mail"
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
 msgstr ""
 
-#: mail/folder-browser-factory.c:30
-msgid "Compose"
+#: mail/folder-browser.c:153
+msgid "Body or subject contains"
+msgstr ""
+
+#: mail/folder-browser.c:154
+msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser-factory.c:30
+#: mail/folder-browser.c:155
 #, fuzzy
-msgid "Compose a new message"
-msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+msgid "Subject contains"
+msgstr "хщЛА"
 
-#: mail/folder-browser-factory.c:34
-msgid "Reply"
+#: mail/folder-browser.c:156
+msgid "Body does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:157
+msgid "Subject does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser-factory.c:34
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:458
+msgid "Filter on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 #, fuzzy
-msgid "Reply to the sender of this message"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+msgid "Open"
+msgstr "╤МОИ_ЦЛА"
 
-#: mail/folder-browser-factory.c:35
-msgid "Reply to All"
+#: mail/folder-browser.c:466
+msgid "Save As..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:35
+#: 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
 #, fuzzy
-msgid "Reply to all recipients of this message"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+msgid "Print"
+msgstr "пЯОТЕЯАИЭТГТА"
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser.c:469
+msgid "Reply to Sender"
+msgstr ""
+
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
+msgid "Reply to All"
+msgstr ""
+
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser-factory.c:37
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+msgid "Forward inline"
+msgstr ""
+
+#: mail/folder-browser.c:474
+msgid "Mark as Read"
+msgstr ""
+
+#: mail/folder-browser.c:475
+msgid "Mark as Unread"
+msgstr ""
+
+#: mail/folder-browser.c:477
 #, fuzzy
-msgid "Forward this message"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Move to Folder..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/folder-browser-factory.c:41
+#: mail/folder-browser.c:478
 #, fuzzy
-msgid "Refile"
-msgstr "еКчЖХГ"
+msgid "Copy to Folder..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: mail/folder-browser.c:480
+msgid "Undelete"
+msgstr ""
 
-#: mail/folder-browser-factory.c:41
+#. { _("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
 #, fuzzy
-msgid "Move message to a new folder"
-msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+msgid "Apply Filters"
+msgstr "_жэЙЕККОР"
 
-#: mail/folder-browser-factory.c:43
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 #, fuzzy
-msgid "Print the selected message"
-msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+msgid "Create Rule From Message"
+msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
+
+#: mail/mail-autofilter.c:71
+#, c-format
+msgid "Mail to %s"
+msgstr ""
 
-#: mail/folder-browser-factory.c:45
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "хщЛА"
+
+#: mail/mail-autofilter.c:230
+#, c-format
+msgid "Mail from %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:331
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: mail/mail-callbacks.c:74
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+
+#: mail/mail-callbacks.c:114
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:128
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+msgid "You have no mail sources configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:213
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:222
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:246
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
 #, fuzzy
-msgid "Delete this message"
-msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+msgid "Move message(s) to"
+msgstr "мщА ЛГМЩЛАТА"
+
+#: mail/mail-callbacks.c:554
+#, fuzzy
+msgid "Copy message(s) to"
+msgstr "мщА ЛГМЩЛАТА"
 
-#: mail/folder-browser-factory.c:65
-msgid "_Threaded Message List"
+#: mail/mail-callbacks.c:665
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
 msgstr ""
 
-#: mail/folder-browser-factory.c:77
-msgid "_Expunge"
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
 msgstr ""
 
-#: mail/folder-browser-factory.c:83
-msgid "_Filter Druid ..."
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
 msgstr ""
 
-#: mail/folder-browser-factory.c:89
-msgid "_Virtual Folder Druid ..."
+#: mail/mail-callbacks.c:748
+msgid "Save Message As..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:95
-msgid "_Mail Configuration ..."
+#: mail/mail-callbacks.c:750
+msgid "Save Messages As..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:101
-msgid "Forget _Passwords"
+#: mail/mail-callbacks.c:877
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-callbacks.c:922
+#, fuzzy
+msgid "Print Message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: mail/mail-callbacks.c:969
+msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config.c:259
+#.
+#. * 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
+msgid "Identity"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:8
+#, fuzzy
+msgid "Mail Source"
+msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config.c:274
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr ""
 
-#: mail/mail-config.c:302
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr ""
 
-#: mail/mail-config.c:325
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr ""
 
-#: mail/mail-config.c:337
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config.c:342
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr ""
 
-#: mail/mail-config.c:699 mail/mail-config.c:790
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr ""
 
-#: mail/mail-config.c:705
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr ""
 
-#: mail/mail-config.c:711
+#: mail/mail-config-gui.c:934
 #, fuzzy
 msgid "Path:"
 msgstr "еПИЙЭККГСГ"
 
-#: mail/mail-config.c:717 mail/mail-config.c:796
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr ""
 
-#: mail/mail-config.c:729 mail/mail-config.c:808
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr ""
 
-#: mail/mail-config.c:755 mail/mail-config.c:830
-msgid "Test these values before continuing"
+#: 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 ""
 
-#: mail/mail-config.c:937
+#: mail/mail-config-gui.c:1003
+msgid "Test Settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:1130
+#, fuzzy
+msgid "Mail source type:"
+msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
+
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -2986,391 +4327,984 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config.c:955
-msgid "Select the method you would like to use to deliver your mail."
+#: mail/mail-config-gui.c:1154
+msgid "News source type:"
 msgstr ""
 
-#: mail/mail-config.c:1129 mail/mail-config.c:1208
-msgid "Mail Configuration"
+#: mail/mail-config-gui.c:1159
+msgid ""
+"Select the kind of news server you have, and enter the relevant information "
+"about it.\n"
+"\n"
+"If the server requires authentication, you can click the \"Detect supported "
+"types...\" button after entering the other information."
 msgstr ""
 
-#. Identity page
-#: mail/mail-config.c:1146
-msgid "Identity"
+#: mail/mail-config-gui.c:1178
+msgid "Mail transport type:"
+msgstr ""
+
+#: mail/mail-config-gui.c:1233
+msgid "Add Identity"
+msgstr ""
+
+#: mail/mail-config-gui.c:1235
+msgid "Edit Identity"
 msgstr ""
 
-#. Source page
-#: mail/mail-config.c:1165
+#: mail/mail-config-gui.c:1333
 #, fuzzy
-msgid "Mail Source"
+msgid "Add Source"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: mail/mail-config-gui.c:1335
+msgid "Edit Source"
+msgstr ""
+
+#: mail/mail-config-gui.c:1430
+#, fuzzy
+msgid "Add News Server"
+msgstr "мщА оЛэДА"
+
+#: mail/mail-config-gui.c:1432
+msgid "Edit News Server"
+msgstr ""
+
+#: mail/mail-config-gui.c:2253
+#, c-format
+msgid "Testing \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2255
+#, c-format
+msgid "Test connection to \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2296
+msgid "The connection was successful!"
+msgstr ""
+
+#: mail/mail-config-gui.c:2346
+#, c-format
+msgid "Querying authorization capabilities of \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2348
+#, c-format
+msgid "Query authorization at \"%s\""
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:7
+msgid "Address"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:11
+#, fuzzy
+msgid "Mail Sources"
 msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
-#. Transport page
-#: mail/mail-config.c:1186
-msgid "Mail Transport"
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
 msgstr ""
 
-#: mail/mail-config.c:1308
-msgid "Edit Identity"
+#: po/tmp/mail-config.glade.h:14
+msgid "News Servers"
 msgstr ""
 
-#: mail/mail-config.c:1310
-msgid "Add Identity"
+#: po/tmp/mail-config.glade.h:15
+#, fuzzy
+msgid "News Sources"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
 msgstr ""
 
-#: mail/mail-config.c:1453
-msgid "Edit Source"
+#: po/tmp/mail-config.glade.h:18
+msgid "Send messages in HTML format"
 msgstr ""
 
-#: mail/mail-config.c:1455
+#: po/tmp/mail-config.glade.h:20
 #, fuzzy
-msgid "Add Source"
+msgid "Sources"
 msgstr "мщА сУМТЭЛЕУСГ"
 
-#: mail/mail-ops.c:372
-msgid "Fetching mail"
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+msgid "Please enter your PGP/GPG passphrase."
+msgstr ""
+
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+msgid "No password provided."
+msgstr ""
+
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/mail-crypto.c:625
+msgid "No GPG/PGP program available."
 msgstr ""
 
-#: mail/mail-ops.c:384
+#: mail/mail-display.c:90
+#, c-format
 msgid ""
-"This message has no subject.\n"
-"Really send?"
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-display.c:113
+#, c-format
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:732
+#: mail/mail-display.c:218
 #, fuzzy
-msgid "Refile message(s) to"
-msgstr "мщА ЛГМЩЛАТА"
+msgid "Save Attachment"
+msgstr "мщА ЕПИСЩМАЬГ..."
 
-#: mail/mail-threads.c:483
-msgid "Currently pending operations:"
+#: mail/mail-display.c:258
+#, c-format
+msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-threads.c:621
-msgid "Incomplete message written on pipe!"
+#: mail/mail-display.c:300
+msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-threads.c:623
-msgid "Error reading commands from dispatching thread."
+#: mail/mail-display.c:302
+#, c-format
+msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-threads.c:712
-msgid "Corrupted message from dispatching thread?"
+#: mail/mail-display.c:304
+msgid "View Inline"
 msgstr ""
 
-#: mail/mail-threads.c:814
-msgid "Could not create dialog box."
+#: mail/mail-display.c:328
+msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-threads.c:849
-msgid "User cancelled query."
+#: mail/mail-display.c:351
+#, c-format
+msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/main.c:62
-msgid "Mail Component: I could not initialize Bonobo"
-msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+#: mail/mail-display.c:355
+msgid "Hide"
+msgstr ""
 
-#: mail/message-list.c:460
+#: mail/mail-format.c:500
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "мЕА ЕПИСЩМАЬГ"
+
+#: mail/mail-format.c:623
+msgid "Reply-To:"
+msgstr ""
+
+#: mail/mail-format.c:845
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+msgid "Encrypted message not displayed"
+msgstr ""
+
+#: mail/mail-format.c:863
 #, fuzzy
-msgid "Online Status"
-msgstr "йАТэСТАСГ СЩМДЕСГР"
+msgid "Encrypted message"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
 
-#: mail/message-list.c:488
-msgid "From"
-msgstr "аПЭ"
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
 
-#: mail/message-list.c:495
-msgid "Subject"
-msgstr "хщЛА"
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
 
-#: mail/message-list.c:502
+#: mail/mail-format.c:1486
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:206
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:261
+msgid "Closing current folder"
+msgstr ""
+
+#: mail/mail-local.c:293
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:314
 #, fuzzy
-msgid "Date"
-msgstr "еПИЙЭККГСГ"
+msgid "Creating new folder"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
 
-#: mail/message-list.c:509
+#: mail/mail-local.c:329
 #, fuzzy
-msgid "Received"
-msgstr "еКчЖХГ"
+msgid "Copying messages"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#: mail/message-list.c:516
-msgid "To"
-msgstr "пЯОР"
+#: mail/mail-local.c:341
+#, c-format
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
+msgstr ""
 
-#: mail/message-list.c:523
-msgid "Size"
-msgstr "лщЦЕХОР"
+#: mail/mail-local.c:372
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
 
-#: shell/e-init.c:25
-msgid "Evolution can not create its local folders"
-msgstr "тО Evolution ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
+#: mail/mail-local.c:781
+msgid "Registering local folder"
+msgstr ""
 
-#: shell/e-setup.c:47
-msgid "Evolution installation"
+#: mail/mail-local.c:783
+msgid "Register local folder"
 msgstr ""
 
-#: shell/e-setup.c:51
-msgid "This seems to be the first time you run Evolution."
+#: mail/mail-ops.c:79
+#, c-format
+msgid "Fetching email from %s"
 msgstr ""
 
-#: shell/e-setup.c:52
-msgid "Please click \"OK\" to install the Evolution user files under"
+#: mail/mail-ops.c:81
+#, c-format
+msgid "Fetch email from %s"
 msgstr ""
 
-#: shell/e-setup.c:69
+#: mail/mail-ops.c:331
 #, c-format
-msgid ""
-"Cannot create the directory\n"
-"%s\n"
-"Error: %s"
+msgid "There is no new mail at %s."
+msgstr ""
+
+#: mail/mail-ops.c:401
+msgid "Filtering email on demand"
+msgstr ""
+
+#: mail/mail-ops.c:403
+msgid "Filter email on demand"
 msgstr ""
 
-#: shell/e-setup.c:84
+#: mail/mail-ops.c:538
 #, c-format
-msgid ""
-"Cannot copy files into\n"
-"`%s'."
+msgid "Sending \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:88
-msgid "Evolution files successfully installed."
+#: mail/mail-ops.c:543
+msgid "Sending a message without a subject"
 msgstr ""
 
-#: shell/e-setup.c:108
+#: 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:720
+msgid "Sending queue"
+msgstr ""
+
+#: mail/mail-ops.c:722
+msgid "Send queue"
+msgstr ""
+
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
-msgid ""
-"The file `%s' is not a directory.\n"
-"Please remove it in order to allow installation\n"
-"of the Evolution user files."
+msgid "Appending \"%s\""
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:81
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
+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
+#, c-format
+msgid "Moving messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1003
+#, c-format
+msgid "Copying messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1006
+#, c-format
+msgid "Move messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1008
+#, c-format
+msgid "Copy messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1039
+msgid "Moving"
+msgstr ""
+
+#: mail/mail-ops.c:1042
+#, fuzzy
+msgid "Copying"
+msgstr "аМТИЦЯАЖч"
+
+#: mail/mail-ops.c:1062
+#, c-format
+msgid "%s message %d of %d (uid \"%s\")"
+msgstr ""
+
+#: mail/mail-ops.c:1141
 #, fuzzy, c-format
-msgid ""
-"Cannot create the specified folder:\n"
-"%s"
+msgid "Marking messages in folder \"%s\""
 msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
 
-#: shell/e-shell-folder-creation-dialog.c:133
-msgid "The specified folder name is not valid."
+#: 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 ""
 
-#: shell/e-shell-folder-creation-dialog.c:223
-#, fuzzy
-msgid "Evolution - Create new folder"
-msgstr "тО Evolution ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
+#: mail/mail-ops.c:1295
+#, 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
+msgid "(No description)"
+msgstr ""
+
+#: mail/mail-ops.c:1432
+#, c-format
+msgid "Attaching messages from folder \"%s\""
+msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:95
+#: 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 ""
-"The type of the selected folder is not valid for\n"
-"the requested operation."
+"Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:236
+#: mail/mail-ops.c:1665
 #, fuzzy
-msgid "New..."
-msgstr "_мщО"
+msgid "Forwarded messages"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: shell/e-shell-folder-title-bar.c:355
-msgid "(Untitled)"
+#: mail/mail-ops.c:1679
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: mail/mail-ops.c:1748
+#, c-format
+msgid "Loading \"%s\""
 msgstr ""
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:110
-msgid "Bug buddy was not found in your $PATH."
+#: mail/mail-ops.c:1750
+#, c-format
+msgid "Load \"%s\""
 msgstr ""
 
-#. same as above
-#: shell/e-shell-view-menu.c:116
-msgid "Bug buddy could not be run."
+#: mail/mail-ops.c:1853
+#, c-format
+msgid "Creating \"%s\""
 msgstr ""
 
-#: shell/e-shell-view-menu.c:159
-msgid "Evolution"
+#: mail/mail-ops.c:1855
+#, c-format
+msgid "Create \"%s\""
 msgstr ""
 
-#: shell/e-shell-view-menu.c:161
-msgid "Copyright 1999, 2000 Helix Code, Inc."
+#: 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
+#, 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: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 ""
+
+#: mail/mail-ops.c:2310
+#, c-format
+msgid "Viewing messages from folder \"%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:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: mail/mail-ops.c:2474
+#, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:104
+msgid "Cancel"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:163
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-threads.c:301
+#, c-format
 msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
+"Error while preparing to %s:\n"
+"%s"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:301
-#, fuzzy
-msgid "Go to folder..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+#: mail/mail-threads.c:675
+#, c-format
+msgid ""
+"Error while `%s':\n"
+"%s"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:365
-msgid "_Folder"
-msgstr "_жэЙЕККОР"
+#: mail/mail-threads.c:732
+msgid "Error reading commands from dispatching thread."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:369
-msgid "Evolution _Bar Shortcut"
-msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+#: mail/mail-threads.c:797
+msgid "Corrupted message from dispatching thread?"
+msgstr ""
+
+#: mail/mail-threads.c:916
+msgid "Could not create dialog box."
+msgstr ""
+
+#: mail/mail-threads.c:927
+msgid "User cancelled query."
+msgstr ""
+
+#: mail/mail-tools.c:189
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr ""
+
+#. Get all uids of source
+#: mail/mail-tools.c:239
+#, c-format
+msgid "Examining %s"
+msgstr ""
+
+#: mail/mail-tools.c:269
+#, c-format
+msgid ""
+"Could not read UID cache file \"%s\". You may receive duplicate messages."
+msgstr ""
+
+#. Info
+#: mail/mail-tools.c:290
+#, c-format
+msgid "Retrieving message %d of %d"
+msgstr ""
+
+#. Append it to dest
+#: mail/mail-tools.c:303
+#, c-format
+msgid "Writing message %d of %d"
+msgstr ""
+
+#: mail/mail-tools.c:332
+#, c-format
+msgid "Saving changes to %s"
+msgstr ""
+
+#: mail/mail-tools.c:369
+#, fuzzy, c-format
+msgid "[%s] (forwarded message)"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: mail/mail-tools.c:379
+msgid "Fwd: (no subject)"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:375
+#: mail/mail-tools.c:418
+#, fuzzy, c-format
+msgid "Forwarded message - %s"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: mail/mail-tools.c:420
 #, fuzzy
-msgid "_Mail message (FIXME)"
-msgstr "_лчМУЛА"
+msgid "Forwarded message (no subject)"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: shell/e-shell-view-menu.c:376 shell/e-shell-view-menu.c:379
-msgid "Composes a new mail message"
-msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+#: mail/mail-tools.c:523
+#, c-format
+msgid ""
+"Cannot open location `%s':\n"
+"%s"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:378
+#: mail/mail-vfolder.c:147
 #, fuzzy
-msgid "_Appointment (FIXME)"
-msgstr "я_АМТЕБОЩ"
+msgid "VFolders"
+msgstr "_жэЙЕККОР"
 
-#: shell/e-shell-view-menu.c:381
+#: mail/mail-vfolder.c:296
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "_цМЫЯИЛъА"
+msgid "New VFolder"
+msgstr "_мщОР жэЙЕККОР"
 
-#: shell/e-shell-view-menu.c:384
-msgid "_Task (FIXME)"
+#. 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
+msgid "Reply"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:387
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 #, fuzzy
-msgid "Task _Request (FIXME)"
-msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+msgid "Reply to the sender of this message"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: shell/e-shell-view-menu.c:390
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 #, fuzzy
-msgid "_Journal Entry (FIXME)"
-msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+msgid "Reply to all recipients of this message"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: shell/e-shell-view-menu.c:398
-msgid "_New"
-msgstr "_мщО"
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+#, fuzzy
+msgid "Forward this message"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
 
-#: shell/e-shell-view-menu.c:402
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 #, fuzzy
-msgid "_Go to folder..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Print the selected message"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
 
-#: shell/e-shell-view-menu.c:402
-msgid "Display a different folder"
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete this message"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: mail/message-list.c:572
+msgid "Unseen"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:404
+#: mail/message-list.c:575
 #, fuzzy
-msgid "_Create new folder..."
-msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+msgid "Seen"
+msgstr "аПОСТОКч"
 
-#: shell/e-shell-view-menu.c:404
-msgid "Create a new folder"
+#: mail/message-list.c:578
+msgid "Answered"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:419
-#, fuzzy
-msgid "Show _shortcut bar"
-msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+#: mail/message-list.c:846
+#, 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:420
+#: mail/message-list.c:860 mail/message-list.c:875
+msgid "<unknown>"
+msgstr ""
+
+#: mail/message-list.c:2068
 #, fuzzy
-msgid "Show the shortcut bar"
-msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+msgid "Rebuilding message view"
+msgstr "мщА ЛГМЩЛАТА"
 
-#: shell/e-shell-view-menu.c:422
+#: mail/message-list.c:2070
 #, fuzzy
-msgid "Show _folder bar"
-msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+msgid "Rebuild message view"
+msgstr "мщА ЛГМЩЛАТА"
 
-#: shell/e-shell-view-menu.c:423
-msgid "Show the folder bar"
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:440
-msgid "Help _Index"
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: shell/e-shell-view-menu.c:443
-msgid "Getting _Started"
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
 msgstr ""
 
-#: shell/e-shell-view-menu.c:446
-msgid "Using the _Mailer"
+#: mail/subscribe-dialog.c:282
+#, c-format
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: shell/e-shell-view-menu.c:449
-msgid "Using the _Calendar"
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: shell/e-shell-view-menu.c:452
-msgid "Using the Cont_act Manager"
+#: mail/subscribe-dialog.c:290
+#, c-format
+msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: shell/e-shell-view-menu.c:457
-msgid "_Submit bug report"
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-shell-view-menu.c:458
-msgid "Submit bug-report via bug-buddy"
+#: shell/e-setup.c:112 shell/e-setup.c:183
+msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:474
-msgid "_Actions"
-msgstr "е_МщЯЦЕИЕР"
+#: shell/e-setup.c:116
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
+msgstr ""
+
+#: shell/e-setup.c:117
+msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+msgstr ""
 
-#: shell/e-shell-view.c:113
+#: shell/e-setup.c:155
+msgid "Could not update files correctly"
+msgstr ""
+
+#: shell/e-setup.c:158 shell/e-setup.c:224
+msgid "Evolution files successfully installed."
+msgstr ""
+
+#: shell/e-setup.c:187
+msgid "This seems to be the first time you run Evolution."
+msgstr ""
+
+#: shell/e-setup.c:188
+msgid "Please click \"OK\" to install the Evolution user files under"
+msgstr ""
+
+#: shell/e-setup.c:205
+#, c-format
+msgid ""
+"Cannot create the directory\n"
+"%s\n"
+"Error: %s"
+msgstr ""
+
+#: shell/e-setup.c:220
+#, c-format
+msgid ""
+"Cannot copy files into\n"
+"`%s'."
+msgstr ""
+
+#: shell/e-setup.c:245
+#, c-format
+msgid ""
+"The file `%s' is not a directory.\n"
+"Please move it in order to allow installation\n"
+"of the Evolution user files."
+msgstr ""
+
+#: shell/e-setup.c:257
+#, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:82
+#, fuzzy, c-format
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: shell/e-shell-folder-creation-dialog.c:134
+msgid "The specified folder name is not valid."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:225
+#, fuzzy
+msgid "Evolution - Create new folder"
+msgstr "тО Evolution ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
+
+#: shell/e-shell-folder-selection-dialog.c:96
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
+msgstr ""
+
+#: shell/e-shell-folder-selection-dialog.c:291
+#, fuzzy
+msgid "New..."
+msgstr "_мщО"
+
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+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
+msgid "Bug buddy was not found in your $PATH."
+msgstr ""
+
+#. same as above
+#: shell/e-shell-view-menu.c:120
+msgid "Bug buddy could not be run."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:172
+msgid "Copyright 1999, 2000 Helix Code, Inc."
+msgstr ""
+
+#: shell/e-shell-view-menu.c:174
+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
+#, fuzzy
+msgid "Go to folder..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:208
+#: shell/e-shell-view.c:455
 #, fuzzy
 msgid "Folders"
 msgstr "_жэЙЕККОР"
 
-#: shell/e-shell-view.c:600
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr ""
 
-#: shell/e-shell.c:299
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shortcut.c:469
-msgid "New group"
-msgstr "мщА оЛэДА"
+#: shell/e-shell.c:1208
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:122
+msgid "Create new shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:125
+msgid "Group name:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:234
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:239
+msgid "Don't remove"
+msgstr ""
 
-#: shell/e-shortcuts-view.c:235
+#: shell/e-shortcuts-view.c:250
 #, fuzzy
-msgid "_Small icons"
+msgid "_Small Icons"
 msgstr "лИЙЯэ еИЙОМъДИА"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:251
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:238
+#: shell/e-shortcuts-view.c:253
 #, fuzzy
-msgid "_Large icons"
+msgid "_Large Icons"
 msgstr "лЕЦэКА еИЙОМъДИА"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:265
+#, fuzzy
+msgid "_New Group..."
+msgstr "мщА оЛэДА"
+
+#: shell/e-shortcuts-view.c:266
+msgid "Create a new shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:268
+#, fuzzy
+msgid "_Remove This Group..."
+msgstr "дИАЦЯАЖч оЛэДАР"
+
+#: shell/e-shortcuts-view.c:269
+#, fuzzy
+msgid "Remove this shortcut group"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#: shell/e-shortcuts-view.c:353
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:353
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:356
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -3379,59 +5313,67 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr "йУЯъЫР сУМТОЛЕЩСЕИР"
 
-#: shell/e-storage.c:217
+#: 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
+#, fuzzy
+msgid "_View"
+msgstr "_мщО"
+
+#: shell/e-storage-set-view.c:235
+#, fuzzy
+msgid "View the selected folder"
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:412
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:414
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:416
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:418
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:420
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:422
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:424
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:426
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:428
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:430
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:432
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:434
-msgid "Unknown error"
-msgstr ""
-
-#: shell/main.c:99
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -3453,97 +5395,1210 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:126
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:172
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:214
-#, fuzzy
-msgid "Cannot initialize the configuration system."
-msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+#: shell/main.c:178
+msgid "Disable."
+msgstr ""
 
-#: shell/main.c:220
+#: shell/main.c:198
 #, fuzzy
 msgid "Cannot initialize the Bonobo component system."
 msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: widgets/e-table/e-table-config.glade.h:7
-msgid "Fields"
+#: 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
+msgid "Create a new contact"
 msgstr ""
 
-#: widgets/e-table/e-table-config.glade.h:8
-msgid "Grouping"
+#: po/tmp/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
+msgid "Find"
 msgstr ""
 
-#: widgets/e-table/e-table-config.glade.h:9
-msgid "Sort"
+#: po/tmp/evolution-addressbook.xml.h:11
+msgid "Find a contact"
 msgstr ""
 
-#: widgets/e-table/e-table-config.glade.h:10
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 #, fuzzy
-msgid "Filter"
-msgstr "_жэЙЕККОР"
+msgid "New"
+msgstr "_мщО"
+
+#: po/tmp/evolution-addressbook.xml.h:14
+#, fuzzy
+msgid "Print contacts"
+msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
+
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:16
+msgid "Stop Loading"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:17
+msgid "View All"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "View all contacts"
+msgstr "еПИКщНТЕ ЕПИСЩМАЬГ"
+
+#: po/tmp/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "о ЙАТэКОЦОР ЦМЫЯИЛИЧМ САР"
+
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+msgid "_Tools"
+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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: widgets/e-table/e-table-field-chooser.glade.h:7
-msgid "Field Chooser"
+#: po/tmp/evolution-calendar.xml.h:6
+msgid "5 Days"
 msgstr ""
 
-#: widgets/e-table/e-table-field-chooser.glade.h:8
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
+#: po/tmp/evolution-calendar.xml.h:7
+msgid "Alter preferences"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: po/tmp/evolution-calendar.xml.h:9
+msgid "Calendar Preferences..."
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:10
+msgid "Create a new appointment"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:11
+msgid "Create a new calendar"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:15
+msgid "Go to"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:16
+msgid "Go to a specific date"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:17
+msgid "Go to present time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:18
+#, fuzzy
+msgid "Month"
+msgstr "цМЫЯИЛъЕР"
+
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+msgid "Next"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Open a calendar"
+msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#: po/tmp/evolution-calendar.xml.h:22
+msgid "Prev"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Print this calendar"
+msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#, fuzzy
+msgid "Today"
+msgstr "счЛЕЯА"
+
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+msgid "_New"
+msgstr "_мщО"
+
+#: po/tmp/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: po/tmp/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "_Print this calendar"
+msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#: po/tmp/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save Calendar As"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: po/tmp/evolution-contact-editor.xml.h:7
+#, fuzzy
+msgid "Delete this item"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: po/tmp/evolution-contact-editor.xml.h:8
+msgid "Delete..."
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+msgid "Help"
+msgstr ""
+
+#: po/tmp/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
+msgid "Print this item"
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/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
+#, fuzzy
+msgid "Save _As..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
+msgstr ""
+
+#: po/tmp/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
+msgid "See online help"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "_File"
+msgstr "_жэЙЕККОР"
+
+#: po/tmp/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
+msgid "_Save"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: widgets/e-table/e-table-group.glade.h:7
-msgid "window1"
+#: po/tmp/evolution-event-editor.xml.h:6
+msgid "About this application"
 msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:8
-msgid "Available fields"
+#: po/tmp/evolution-event-editor.xml.h:7
+msgid "About..."
 msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:9
-msgid "label1"
+#: po/tmp/evolution-event-editor.xml.h:8
+#, fuzzy
+msgid "Actio_ns"
+msgstr "е_МщЯЦЕИЕР"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "йОПч"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+msgid "Clear"
 msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:10
-msgid "Show in this order"
+#: po/tmp/evolution-event-editor.xml.h:12
+msgid "Clear the selection"
 msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:11
-msgid "label2"
+#: po/tmp/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
+msgid "Copy"
+msgstr "аМТИЦЯАЖч"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "йОПч"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:12
-msgid "Add >>"
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:13
+#: po/tmp/evolution-event-editor.xml.h:28
 #, fuzzy
-msgid "<< Remove"
+msgid "FIXME: Define Print _Styles"
+msgstr "аъ_ТГСГ сУМэМТГСГР"
+
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:38
+msgid "FIXME: Print Pre_view"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:43
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "мщА ЕПИСЩМАЬГ..."
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:45
+#, fuzzy
+msgid "FIXME: Task _Request"
+msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+
+#: po/tmp/evolution-event-editor.xml.h:46
+#, fuzzy
+msgid "FIXME: _Contact"
+msgstr "_цМЫЯИЛъА"
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:50
+#, fuzzy
+msgid "FIXME: _Formatting"
+msgstr "_цМЫЯИЛъА"
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:52
+#, fuzzy
+msgid "FIXME: _Journal Entry"
+msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:54
+#, fuzzy
+msgid "FIXME: _Mail Message"
+msgstr "_лчМУЛА"
+
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:56
+msgid "FIXME: _Move to Folder..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:57
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "я_АМТЕБОЩ"
+
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "F_ormat"
+msgstr "аПЭ"
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:73
+msgid "N_ext"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "еПИЙЭККГСГ"
+
+#: po/tmp/evolution-event-editor.xml.h:76
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "еПИЙЭККГСГ АМТИЙЕИЛщМОУ АПО ТО ПЯЭВЕИЯО"
+
+#: po/tmp/evolution-event-editor.xml.h:77
+msgid "Pre_vious"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:78
+msgid "Previous"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:79
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: po/tmp/evolution-event-editor.xml.h:80
+#, fuzzy
+msgid "Print Setup"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: po/tmp/evolution-event-editor.xml.h:83
+#, fuzzy
+msgid "Properties"
+msgstr "иДИЭТГТЕР"
+
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
 msgstr "дИАЦЯАЖч"
 
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "еКчЖХГ"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
+
+#: po/tmp/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
+msgid "Save the current file"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:99
+msgid "Select All"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:100
+msgid "Select everything"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr "аЙЩЯЫСГ"
+
+#: po/tmp/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
+msgid "_About..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+msgid "_Close"
+msgstr ""
+
+#: po/tmp/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
+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
+msgid "_Edit"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: po/tmp/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
+#, fuzzy
+msgid "_Help"
+msgstr "сГЛЕъЫ_ЛА"
+
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:115
+#, fuzzy
+msgid "_Object"
+msgstr "хщЛА"
+
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "еПИЙЭККГСГ"
+
+#: po/tmp/evolution-event-editor.xml.h:117
+#, fuzzy
+msgid "_Print"
+msgstr "пЯОТЕЯАИЭТГТА"
+
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "иДИЭТГТЕР"
+
+#: po/tmp/evolution-event-editor.xml.h:119
+msgid "_Redo"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:122
+#, fuzzy
+msgid "_Toolbars"
+msgstr "е_ЯЦАКЕъА"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+#, fuzzy
+msgid "_Undo"
+msgstr "аЙЩЯЫСГ"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
+msgid "Compose"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:7
+#, fuzzy
+msgid "Compose a new message"
+msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+
+#: po/tmp/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
+#, fuzzy
+msgid "F_older"
+msgstr "_жэЙЕККОР"
+
+#: po/tmp/evolution-mail.xml.h:14
+msgid "Fi_lter on Sender"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:15
+msgid "Filter on Rec_ipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Get Mail"
+msgstr "_лчМУЛА"
+
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
+msgstr "_жэЙЕККОР"
+
+#: po/tmp/evolution-mail.xml.h:22
+msgid "Manage Subscriptions"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Mar_k As Read"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:24
+msgid "Mark As U_nread"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Move"
+msgstr "_лчМУЛА"
+
+#: po/tmp/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Move message to a new folder"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: po/tmp/evolution-mail.xml.h:27
+msgid "Previews the message to be printed"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "еИСэЦЕТЕ ТОМ ПАЯАКчПТГ ТОУ ЛГМЩЛАТОР"
+
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Print message..."
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: po/tmp/evolution-mail.xml.h:35
+msgid "Reply to _All"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:36
+msgid "Reply to _Sender"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+msgid "Select _All"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:41
+msgid "Threaded Message list"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:42
+msgid "VFolder on Se_nder"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:43
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
+#, fuzzy
+msgid "_Apply Filters"
+msgstr "_жэЙЕККОР"
+
+#: po/tmp/evolution-mail.xml.h:46
+#, fuzzy
+msgid "_Configure Folder"
+msgstr "_мщОР жэЙЕККОР"
+
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: po/tmp/evolution-mail.xml.h:49
+#, fuzzy
+msgid "_Edit Message"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:51
+msgid "_Filter on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:52
+msgid "_Forward"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:55
+#, fuzzy
+msgid "_Message"
+msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
+
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: po/tmp/evolution-mail.xml.h:57
+#, fuzzy
+msgid "_Open in New Window"
+msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
+
+#: po/tmp/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Print Message"
+msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+
+#: po/tmp/evolution-mail.xml.h:59
+msgid "_Save Message As..."
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "мщА сУМТЭЛЕУСГ"
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+msgid "_Undelete"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:63
+msgid "_VFolder on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
+msgstr ""
+
+#.
+#. * 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
+msgid "Attach"
+msgstr "еПИСЩМАЬГ"
+
+#: po/tmp/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "Close the current file"
+msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:12
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "еПИСЩМАЬГ АЯВЕъОУ СТО ЛчМУЛА"
+
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert text file..."
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "╤МОИЦЛА жАЙщККОУ"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "гЛЕЯОКЭЦИО"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "аПОХчЙЕУСГ ТОУ ЛГМЩЛАТОР СТОМ ЙАХОЯИСЛщМО ЖэЙЕККО"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "аПОСТОКч"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+msgid "Send _Later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:26
+msgid "Send _later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send the mail in HTML format"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "еЛЖэМИСГ/АПЭЙЯУЬГ ЕПИСУМэЬЕЫМ"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show _attachments"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "еЛЖэМИСГ ЕПИСУМэ_ЬЕЫМ"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "╤МОИ_ЦЛА"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:7
+msgid "E_xit"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution bar _shortcut"
+msgstr "ц_ЯАЛЛч сУМТОЛЕЩСЕЫМ ТОУ Evolution"
+
+#: po/tmp/evolution.xml.h:9
+msgid "Exit the program"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:10
+msgid "Getting _Started"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:12
+#, fuzzy
+msgid "Show the _Folder Bar"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#: po/tmp/evolution.xml.h:13
+#, fuzzy
+msgid "Show the _Shortcut Bar"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#: po/tmp/evolution.xml.h:14
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: po/tmp/evolution.xml.h:16
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:17
+#, fuzzy
+msgid "Toggle whether to show the shortcut bar"
+msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#: po/tmp/evolution.xml.h:18
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:19
+msgid "Using the _Calendar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:21
+msgid "_About Evolution..."
+msgstr ""
+
+#: po/tmp/evolution.xml.h:22
+#, fuzzy
+msgid "_Appointment (FIXME)"
+msgstr "я_АМТЕБОЩ"
+
+#: po/tmp/evolution.xml.h:23
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "_цМЫЯИЛъА"
+
+#: po/tmp/evolution.xml.h:26
+msgid "_Folder"
+msgstr "_жэЙЕККОР"
+
+#: po/tmp/evolution.xml.h:27
+#, fuzzy
+msgid "_Go to Folder..."
+msgstr "аПОХчЙЕУСГ СТО ЖэЙЕККО..."
+
+#: po/tmp/evolution.xml.h:29
+msgid "_Index"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:30
+#, fuzzy
+msgid "_Mail message (FIXME)"
+msgstr "_лчМУЛА"
+
+#: po/tmp/evolution.xml.h:32
+#, fuzzy
+msgid "_Settings"
+msgstr "е_МщЯЦЕИЕР"
+
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr ""
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr ""
@@ -3623,22 +6678,145 @@ msgstr "аъ_ТГСГ сУМэМТГСГР"
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:106
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+msgid "%B %Y"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:633
+#: widgets/misc/e-dateedit.c:408
+#, 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
+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
+msgid "%I:%M %p"
+msgstr ""
+
+#: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Send a new message"
-#~ msgstr "аПОСТОКч ТОУ ЛГМЩЛАТОР"
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "я_АМТЕБОЩ"
 
 #, fuzzy
-#~ msgid "Find messages"
-#~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
+#~ msgid "_New Contact"
+#~ msgstr "_цМЫЯИЛъА"
+
+#, fuzzy
+#~ msgid "Gnome Calendar"
+#~ msgstr "гЛЕЯОКЭЦИО"
+
+#, fuzzy
+#~ msgid "_New appointment..."
+#~ msgstr "я_АМТЕБОЩ"
+
+#, fuzzy
+#~ msgid "About Calendar"
+#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#, fuzzy
+#~ msgid "'s calendar"
+#~ msgstr "тО ГЛЕЯОКЭЦИЭ САР"
+
+#, fuzzy
+#~ msgid "Change"
+#~ msgstr "еПИЙЭККГСГ"
+
+#, fuzzy
+#~ msgid "To-do list"
+#~ msgstr "е_ЯЦАКЕъА"
+
+#, fuzzy
+#~ msgid "Second"
+#~ msgstr "аПОСТОКч"
+
+#, fuzzy
+#~ msgid "Alarm Properties"
+#~ msgstr "еПИСЩМАЬГ"
+
+#~ msgid "Cut selected item into clipboard"
+#~ msgstr "йОПч ЕПИКЕЦЛщМОУ АМТИЙЕИЛщМОУ СТО ПЯЭВЕИЯО"
+
+#~ msgid "Copy selected item into clipboard"
+#~ msgstr "аМТИЦЯАЖч ЕПИКЕЦЛщМОУ АМТИЙЕИЛщМОУ СТО ПЯЭВЕИЯО"
+
+#~ msgid "Select recipients' addresses"
+#~ msgstr "еПИКщНТЕ ТГ ДИЕЩХУМСГ ТОУ ПАЯАКчПТГ"
+
+#, fuzzy
+#~ msgid "To: >>"
+#~ msgstr "пЯОР:"
+
+#, fuzzy
+#~ msgid "Cc: >>"
+#~ msgstr "аМТъЦЯАЖО:"
+
+#, fuzzy
+#~ msgid "Bcc: >>"
+#~ msgstr "йЯУЖЭ АМТъЦЯАЖО:"
+
+#, fuzzy
+#~ msgid "Discard this message?"
+#~ msgstr "аПОСТОКч ПАЯЭМТОР ЛГМЩЛАТОР"
+
+#~ msgid "Cut selected region into the clipboard"
+#~ msgstr "йОПч ЕПИКЕЦЛщМГР ПЕЯИОВчР СТО ПЯЭВЕИЯО"
+
+#~ msgid "Copy selected region into the clipboard"
+#~ msgstr "аМТИЦЯАЖч ЕПИКЕЦЛщМГР ПЕЯИОВчР СТО ПЯЭВЕИЯО"
+
+#~ msgid "Paste selected region into the clipboard"
+#~ msgstr "еПИЙЭККГСГ ЕПИКЕЦЛщМГР ПЕЯИОВчР АПЭ ТО ПЯЭВЕИЯО"
+
+#~ msgid "Mail Component: I could not initialize Bonobo"
+#~ msgstr "лОМэДА тАВ/ЛЕъОУ: аЯВИЙОПОъГСГ ТОУ Bonobo АДЩМАТГ"
+
+#~ msgid "To"
+#~ msgstr "пЯОР"
+
+#~ msgid "Size"
+#~ msgstr "лщЦЕХОР"
+
+#~ msgid "Evolution can not create its local folders"
+#~ msgstr "тО Evolution ДЕ ЛПОЯЕъ МА ДГЛИОУЯЦчСЕИ ТОУР ТОПИЙОЩР ЖАЙщККОУР"
+
+#~ msgid "Composes a new mail message"
+#~ msgstr "сУЦЦЯАЖч МщОУ ЛГМЩЛАТОР"
+
+#, fuzzy
+#~ msgid "Task _Request (FIXME)"
+#~ msgstr "аъТГ_СГ еЙЙЯЕЛЭТГТАР"
+
+#, fuzzy
+#~ msgid "_Journal Entry (FIXME)"
+#~ msgstr "йАТАВЧЯГСГ гЛЕЯО_КОЦъОУ"
+
+#, fuzzy
+#~ msgid "Show _shortcut bar"
+#~ msgstr "дИАЦЯАЖч АПЭ цЯАЛЛч сУМТОЛЕЩСЕЫМ"
+
+#, fuzzy
+#~ msgid "Cannot initialize the configuration system."
+#~ msgstr "аЯВИЙОПОъГСГР ТОУ СУСТчЛАТОР ЛОМэДЫМ Bonobo АМЕПИТУВчР"
+
+#, fuzzy
+#~ msgid "<< Remove"
+#~ msgstr "дИАЦЯАЖч"
 
 #~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
 #~ msgstr ""
@@ -3647,24 +6825,9 @@ msgstr ""
 #~ msgid "Whether a message preview should be shown"
 #~ msgstr "╦АМ ХщКЕТЕ ч ОВИ ПЯОЕПИСЙЭПИСГ ЛГМУЛэТЫМ"
 
-#~ msgid "_Task"
-#~ msgstr "еЙЙЯЕЛЭ_ТГТА"
-
-#~ msgid "_Selected Items"
-#~ msgstr "еПИКЕ_ЦЛщМА аМТИЙЕъЛЕМА"
-
-#~ msgid "_New Folder"
-#~ msgstr "_мщОР жэЙЕККОР"
-
-#~ msgid "_Open"
-#~ msgstr "╤МОИ_ЦЛА"
-
 #~ msgid "Clos_e All Items"
 #~ msgstr "йК_ЕъСИЛО ╪КЫМ"
 
-#~ msgid "Closes all the open items"
-#~ msgstr "йКЕъСИЛО ЭКЫМ ТЫМ АМОИВТЧМ АМТИЙЕИЛщМЫМ"
-
 #~ msgid ""
 #~ "Evolution detected that the file `%s' is a not a directory.\n"
 #~ "\n"
@@ -3691,19 +6854,9 @@ msgstr ""
 #~ " ДОЙИЛэСЕТЕ ТО ПАЯЭМ ПЯЭЦЯАЛЛА. \n"
 #~ "     ╦ВЕТЕ ПЯОЕИДОПОИГХЕъ!\n"
 
-#~ msgid ""
-#~ "An exception occured while trying to load data into the component with "
-#~ "PersistStream"
-#~ msgstr ""
-#~ "пЯОщЙУЬЕ ЕНАъЯЕСГ ЙАТэ ТГМ АПЭПЕИЯА АМэЦМЫСГР ДЕДОЛщМЫМ ЛЕ PersistStream АПЭ "
-#~ "ТГ ЛОМэДА"
-
 #~ msgid "The %s component doesn't support PersistStream!\n"
 #~ msgstr "г ЛОМэДА %s ДЕМ УПОСТГЯъФЕИ ТА PersistStream!\n"
 
-#~ msgid "Message status"
-#~ msgstr "йАТэСТАСГ ЛГМУЛэТЫМ"
-
 #~ msgid "A folder containing mail items"
 #~ msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
 
@@ -3713,9 +6866,6 @@ msgstr ""
 #~ msgid "A folder containing calendar entries"
 #~ msgstr "жэЙЕККОР ПОУ ПЕЯИщВЕИ СТОИВЕъА ГЛЕЯОКОЦъОУ"
 
-#~ msgid "A folder containing tasks"
-#~ msgstr "жэЙЕКОР ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
-
 #~ msgid "A service containing mail items"
 #~ msgstr "уПГЯЕСъА ПОУ ПЕЯИщВЕИ ЛГМЩЛАТА"
 
@@ -3728,21 +6878,6 @@ msgstr ""
 #~ msgid "A service containing tasks"
 #~ msgstr "уПГЯЕСъА ПОУ ПЕЯИщВЕИ ЕЙЙЯЕЛЭТГТЕР"
 
-#~ msgid "Add New Group"
-#~ msgstr "мщА оЛэДА"
-
-#~ msgid "Remove Group"
-#~ msgstr "дИАЦЯАЖч оЛэДАР"
-
-#~ msgid "Rename Group"
-#~ msgstr "лЕТОМОЛАСъА оЛэДАР"
-
-#~ msgid "Open in New Window"
-#~ msgstr "╤МОИЦЛА СЕ мщО пАЯэХУЯО"
-
-#~ msgid "Advanced Find"
-#~ msgstr "аМАФчТГСГ ЦИА пЯОВЫЯГЛщМОУР"
-
 #~ msgid "Rename Shortcut"
 #~ msgstr "лЕТОМОЛАСъА сУМТЭЛЕУСГР"
 
@@ -3755,9 +6890,6 @@ msgstr ""
 #~ msgid "Sent mail messages"
 #~ msgstr "аПЕСТАКЛщМА ЛГМЩЛАТА"
 
-#~ msgid "Draft mail messages"
-#~ msgstr "пЯЭВЕИЯА ЛГМЩЛАТА"
-
 #~ msgid "Tasks list"
 #~ msgstr "йАТэКОЦОР ЕЙЙЯЕЛОТчТЫМ"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 4687b95b39..02d17558a4 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6\n"
-"POT-Creation-Date: 2000-10-22 16:13+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Robert Brady <rwb197@zepler.org>\n"
 "Language-Team: \n"
@@ -13,14 +13,232 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/e-card.c:3046
+msgid "Card: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3048
+msgid ""
+"\n"
+"Name: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3053
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3067
+msgid ""
+"\n"
+"Birth Date: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3078
+msgid ""
+"\n"
+"Address:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3086
+msgid ""
+"\n"
+"  Country:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3138
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3141
+msgid ""
+"\n"
+"E-mail:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3178
+msgid ""
+"\n"
+"Business Role: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3191
+msgid ""
+"\n"
+"  Name:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3199
+msgid ""
+"\n"
+"Categories: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
+
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: 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:1190
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1190
-#: calendar/conduits/todo/todo-conduit.c:1069 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
@@ -139,25 +357,28 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:308
-#: addressbook/conduit/address-conduit.c:322
-msgid "BLARG\n"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:210
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:743
-#: calendar/conduits/calendar/calendar-conduit.c:733
-#: calendar/conduits/todo/todo-conduit.c:612
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:744
-#: calendar/conduits/calendar/calendar-conduit.c:734
-#: calendar/conduits/todo/todo-conduit.c:613
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:780
-#: addressbook/conduit/address-conduit.c:783
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -178,111 +399,11 @@ msgstr ""
 msgid "Available Categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr ""
 
@@ -296,7 +417,7 @@ msgid "_Add"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-mail.h:31
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr ""
 
@@ -309,9 +430,13 @@ msgstr ""
 msgid "New phone type"
 msgstr ""
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:90 mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr ""
 
@@ -351,6 +476,11 @@ msgstr ""
 msgid "_Mobile"
 msgstr ""
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr ""
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr ""
@@ -364,7 +494,7 @@ msgid "C_ontacts..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr ""
 
@@ -381,7 +511,7 @@ msgid "_Address..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr ""
 
@@ -426,59 +556,146 @@ msgid "No_tes:"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 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/fulladdr.glade.h:7
-msgid "Check Address"
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-msgid "_Address:"
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "_City:"
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-msgid "_PO Box:"
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:12
-msgid "_State/Province:"
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:14
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:7
 msgid "Canada"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:15
+#: po/tmp/fulladdr.glade.h:8
+msgid "Check Address"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:10
 msgid "Finland"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:16
-msgid "_ZIP Code:"
-msgstr "_Post Code:"
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
+#: po/tmp/fulladdr.glade.h:12
+msgid "_Address:"
 msgstr ""
 
+#: po/tmp/fulladdr.glade.h:13
+msgid "_City:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:14
+msgid "_PO Box:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:15
+msgid "_State/Province:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:16
+msgid "_ZIP Code:"
+msgstr "_Post Code:"
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -535,19 +752,24 @@ msgstr ""
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:310
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:10
+#.
+#. * 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
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:444
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:449
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -556,10 +778,30 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+msgid "Show All"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:584
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+msgid "Advanced..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:533
+msgid "Any field contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:534
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:535
+msgid "Email contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -568,173 +810,169 @@ msgid "External Directories"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
+#: po/tmp/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
+#: po/tmp/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
+#: po/tmp/select-names.glade.h:6
+msgid "Find..."
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Find..."
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
 msgstr ""
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/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:10
-msgid "Message Recipients"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr ""
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr ""
 
@@ -751,198 +989,187 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:487
-msgid "Search"
-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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
+#: po/tmp/e-contact-print.glade.h:18
+msgid "Headings"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Headings"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:80
-msgid "label26"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:42
-msgid "Size:"
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
+#: po/tmp/e-contact-print.glade.h:41
+msgid "Size:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr ""
 
@@ -954,13 +1181,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:688
-#: calendar/conduits/todo/todo-conduit.c:567
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:797
-#: calendar/conduits/calendar/calendar-conduit.c:800
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -972,8 +1199,8 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:676
-#: calendar/conduits/todo/todo-conduit.c:679
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1017,49 +1244,46 @@ msgstr ""
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:386
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:410
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr ""
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr ""
 
@@ -1091,7 +1315,7 @@ msgstr ""
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1100,51 +1324,50 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
-#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 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:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr ""
 
@@ -1161,473 +1384,459 @@ msgid "No summary available."
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-subscribe.h:10
+#: 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
 msgid "Close"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
+#: po/tmp/alarm-notify.glade.h:7
+msgid "Edit appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-msgid "Edit appointment"
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
 msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:354
-msgid "Monday"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Tuesday"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Wednesday"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Colours"
+
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Thursday"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Friday"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Saturday"
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23 calendar/gui/prop.c:353
-msgid "Sunday"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: po/tmp/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Display options"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Date navigator options"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "Pick a colour"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
-msgid "Due Date"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
-msgid "Time Until Due"
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-msgid "Priority"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Items Due Today"
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Colours"
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "Pick a colour"
+#: po/tmp/cal-prefs-dialog.glade.h:50
+msgid "TaskPad"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Items Not Yet Due:"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Overdue Items:"
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "TaskPad"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Remind me of all appointments"
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "seconds."
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
+#.
+#. * 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
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:657
-msgid "Edit Task"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:285
-msgid "No summary"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:291
-#, c-format
-msgid "Appointment - %s"
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:294
-#, c-format
-msgid "Task - %s"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:297
-#, c-format
-msgid "Journal entry - %s"
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
 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.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
+#: po/tmp/task-editor-dialog.glade.h:16
+msgid "Low"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
+#. 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
+msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "% Comp_lete:"
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
+#: po/tmp/task-editor-dialog.glade.h:24
+msgid "Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "High"
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Low"
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:989
-#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
-#: widgets/misc/e-dateedit.c:1171
-msgid "None"
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "Task"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "URL:"
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:294
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:92 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:163 ui/evolution-addressbook.h:20
-#: ui/evolution-contact-editor.h:12 ui/evolution-contact-editor.h:19
-#: ui/evolution-mail.h:59
+#: 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:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: 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
 msgid "New appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1638,234 +1847,198 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:279
-msgid "Edit Appointment"
-msgstr ""
-
-#: calendar/gui/event-editor.c:1749 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr ""
-
-#. todo
-#.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
 #.
-#. figure out why alarm units aren't sticking between edits
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:6
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Start time:"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "End time:"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Display"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Program"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Mail"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Mail _to:"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "_Run program:"
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: po/tmp/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "Recurrence rule"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Daily"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Weekly"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Monthly"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Yearly"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "label23"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-#: calendar/gui/event-editor-dialog.glade.h:51
-#: calendar/gui/event-editor-dialog.glade.h:81
-msgid "Every "
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "day(s)"
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "label24"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "week(s)"
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "label25"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Recur on the"
+#: po/tmp/event-editor-dialog.glade.h:38
+msgid "_Starting date:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "th day of the month"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Every"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:79
+#: po/tmp/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:82
-msgid "year(s)"
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "label27"
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:84
-msgid "Ending date"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Repeat forever"
+#: calendar/gui/event-editor.c:407
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "End on "
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "End after"
+#: calendar/gui/event-editor.c:559
+msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "occurrence(s)"
+#: calendar/gui/event-editor.c:566
+msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "Exceptions"
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:91
-msgid "Change"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "Recurrence"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -1964,11 +2137,11 @@ msgstr ""
 msgid "saturday"
 msgstr ""
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr ""
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr ""
 
@@ -1976,19 +2149,15 @@ msgstr ""
 msgid "fortnight"
 msgstr ""
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr ""
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr ""
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr ""
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr ""
 
@@ -1996,7 +2165,7 @@ msgstr ""
 msgid "min"
 msgstr ""
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr ""
 
@@ -2016,8 +2185,8 @@ msgstr ""
 msgid "today"
 msgstr ""
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr ""
 
@@ -2082,52 +2251,29 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: 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:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1166
+#: 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:1471 calendar/gui/gnome-cal.c:1526
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr ""
 
@@ -2339,419 +2485,1021 @@ msgstr ""
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:801
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
+#. 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
+msgid "SMTWTFS"
+msgstr ""
+
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr ""
+
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:146
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:156
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:197
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:243
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:254
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:272
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:304
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:316
+#, c-format
+msgid "Could not fork: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:354
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:355
+msgid "(Unknown error)"
+msgstr ""
+
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
+msgstr ""
+
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr ""
+
+#: camel/camel-remote-store.c:182
+#, c-format
+msgid "%s server %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:186
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:227
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:228
+msgid "(unknown host)"
+msgstr ""
+
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
 msgstr ""
 
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
+#: camel/camel-service.c:120
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr ""
+
+#: camel/camel-service.c:129
+#, c-format
+msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
+#: camel/camel-service.c:138
+#, c-format
+msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: calendar/gui/prop.c:342
-msgid "24-hour"
+#: camel/camel-service.c:488
+#, c-format
+msgid "No such host %s."
 msgstr ""
 
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
+#: camel/camel-service.c:491
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
+#: camel/camel-session.c:272
+#, c-format
+msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: calendar/gui/prop.c:375
+#: camel/camel-session.c:360
+#, c-format
 msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-url.c:78
+#, c-format
+msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: calendar/gui/prop.c:391
-msgid "Day start:"
+#: camel/camel-url.c:93
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: calendar/gui/prop.c:402
-msgid "Day end:"
+#: camel/camel-url.c:154
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "Colours for display"
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
 
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
 msgstr ""
 
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
+#: camel/providers/imap/camel-imap-command.c:216
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
+#: camel/providers/imap/camel-imap-command.c:224
+#, c-format
+msgid "IMAP command failed: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+msgid "Unknown error"
 msgstr ""
 
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
 msgstr ""
 
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
+#: camel/providers/imap/camel-imap-command.c:407
+#, c-format
+msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: calendar/gui/prop.c:687
-msgid "To Do List"
+#: camel/providers/imap/camel-imap-command.c:443
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:718
-msgid "Preferences"
+#: camel/providers/imap/camel-imap-folder.c:216
+#, c-format
+msgid "Could not load summary for %s"
 msgstr ""
 
-#: calendar/gui/prop.c:786
-msgid "Alarms"
+#: camel/providers/imap/camel-imap-folder.c:586
+msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
 msgstr ""
 
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
+#: camel/providers/imap/camel-imap-provider.c:41
+msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
+#: 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 ""
 
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
+#: camel/providers/imap/camel-imap-store.c:236
+msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:186
-msgid "Cut"
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:333
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:187
-msgid "Cut selected item into clipboard"
+#: camel/providers/imap/camel-imap-store.c:359
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:190 ui/evolution-mail.h:55
-msgid "Copy"
+#: camel/providers/imap/camel-imap-store.c:539
+#, c-format
+msgid "Could not create directory %s: %s"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:191
-msgid "Copy selected item into clipboard"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:194
-#: composer/e-msg-composer-address-dialog.c:202
-msgid "Paste"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:195
-#: composer/e-msg-composer-address-dialog.c:203
-msgid "Paste item from clipboard"
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:529
-msgid "Select recipients' addresses"
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
 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.
-#.
-#: composer/e-msg-composer-address-dialog.glade.h:7
-msgid "Recipient list:"
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:9
-msgid "Search..."
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:10
-msgid "Name"
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:11
-#: mail/mail-config.glade.h:8
-msgid "Address"
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, 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
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:117
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:160
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:234
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:341
+#, 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
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:491
+#, 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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:562
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:579
+#, 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
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:604
+#, c-format
+msgid "Could not close temp folder: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:615
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:817
+#, c-format
+msgid "Unknown error: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mh-store.c:116
+#, c-format
+msgid "`%s' is not a directory."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: 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:144
+#, c-format
+msgid "Message %s not found."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:179
+msgid "Could not open folder: message listing was incomplete."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:273
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:150
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:160
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:172
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:217
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:12
-msgid "Properties..."
+#: camel/providers/pop3/camel-pop3-store.c:335
+#, c-format
+msgid "Could not connect to POP server on %s."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:389
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, 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
+msgid "(Unknown)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:438
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:446
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:555
+#, c-format
+msgid "No such folder `%s'."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+msgid "Sendmail"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, c-format
+msgid "Could not send message: %s"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:14
-msgid "To: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:15
-msgid "Cc: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+msgid "sendmail"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:16
-msgid "Bcc: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:17
-msgid "label9"
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:18
-msgid "label7"
+#: camel/providers/vee/camel-vee-provider.c:30
+msgid "Virtual folder email provider"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:19
-msgid "label8"
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:82
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:84
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:91
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:411
-msgid "Add attachment"
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:474 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/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
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:506
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:507
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
+#: po/tmp/e-msg-composer-attachment.glade.h:8
+msgid "File name:"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:10
-msgid "File name:"
+#: po/tmp/e-msg-composer-attachment.glade.h:9
+msgid "MIME type:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:244
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:291
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313
+#: composer/e-msg-composer-hdrs.c:307
 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:319
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr ""
 
-#: composer/e-msg-composer.c:408
+#: composer/e-msg-composer.c:429
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:419
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:439
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:461
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:463
-msgid "About to save changes to message..."
+#: composer/e-msg-composer.c:654
+msgid "Save changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:548 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:695
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:554
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:576
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:702
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr ""
 
-#: composer/e-msg-composer.c:712
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:722
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:732
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:754
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:775
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:1137
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr ""
 
-#: composer/e-msg-composer.c:1211
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr ""
 
-#: filter/filter-datespec.c:61
-msgid "years"
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: filter/e-search-bar.c:176
+msgid "Sear_ch"
 msgstr ""
 
 #: filter/filter-datespec.c:62
-msgid "months"
+msgid "years"
 msgstr ""
 
 #: filter/filter-datespec.c:63
-msgid "weeks"
+msgid "months"
 msgstr ""
 
 #: filter/filter-datespec.c:64
-msgid "days"
+msgid "weeks"
 msgstr ""
 
 #: filter/filter-datespec.c:65
-msgid "hours"
+msgid "days"
 msgstr ""
 
 #: filter/filter-datespec.c:66
-msgid "minutes"
+msgid "hours"
 msgstr ""
 
 #: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr ""
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -2759,98 +3507,327 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:158 filter/score-editor.c:127
-#: filter/vfolder-editor.c:153
-msgid "Add Rule"
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
+msgid "Add Filter Rule"
+msgstr ""
+
+#: filter/filter-editor.c:233
+msgid "Edit Filter Rule"
+msgstr ""
+
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
 msgstr ""
 
-#: filter/filter-editor.c:199
-msgid "Edit Rule"
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+msgid "Edit Filters"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:396
+#: filter/filter-filter.c:401
 msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:409
+#: filter/filter-filter.c:414
 msgid "Add action"
 msgstr ""
 
-#: filter/filter-filter.c:415
+#: filter/filter-filter.c:420
 msgid "Remove action"
 msgstr ""
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:253
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:184
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:494
+#: filter/filter-rule.c:520
 msgid "Rule name: "
 msgstr ""
 
-#: filter/filter-rule.c:498
-msgid "untitled"
+#: filter/filter-rule.c:524
+msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:509
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:526
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:530
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:537
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:550
-msgid "More criterion"
+#: filter/filter-rule.c:577
+msgid "Add criterion"
+msgstr ""
+
+#: filter/filter-rule.c:583
+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 ""
+
+#: po/tmp/filter.glade.h:10
+msgid "Edit VFolders"
+msgstr ""
+
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr ""
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr ""
+
+#: po/tmp/filter.glade.h:15
+msgid "Virtual Folders"
+msgstr ""
+
+#: po/tmp/filter.glade.h:16
+msgid "vFolder Sources"
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Colour"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:4
+msgid "Copy to Folder"
+msgstr ""
+
+#: filter/libfilter-i18n.h:5
+msgid "Date received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:6
+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 ""
+
+#: filter/libfilter-i18n.h:12
+msgid "Message was received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:13
+msgid "Message was sent"
+msgstr ""
+
+#: filter/libfilter-i18n.h:14
+msgid "Move to Folder"
+msgstr ""
+
+#: filter/libfilter-i18n.h:16
+msgid "Recipients"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+msgid "Sender"
+msgstr ""
+
+#: filter/libfilter-i18n.h:19
+msgid "Set Status"
+msgstr ""
+
+#: filter/libfilter-i18n.h:20
+msgid "Source"
+msgstr ""
+
+#: filter/libfilter-i18n.h:21
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
+msgid "Status"
+msgstr ""
+
+#: filter/libfilter-i18n.h:23
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:24
+msgid "Subject"
+msgstr ""
+
+#: filter/libfilter-i18n.h:25
+msgid "after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:27
+msgid "contains"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
+msgid "is greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+msgid "is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:39
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:40
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "was after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "was before"
 msgstr ""
 
-#: filter/filter-rule.c:556
-msgid "Fewer criterion"
+#: filter/score-editor.c:127
+msgid "Add Rule"
 msgstr ""
 
-#: filter/score-editor.c:165
+#: filter/score-editor.c:166
 msgid "Edit Score Rule"
 msgstr ""
 
@@ -2858,50 +3835,163 @@ msgstr ""
 msgid "Score"
 msgstr ""
 
-#: filter/vfolder-editor.c:192
+#: filter/vfolder-editor.c:155
+msgid "Add VFolder Rule"
+msgstr ""
+
+#: filter/vfolder-editor.c:204
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:236
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/component-factory.c:243
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Cannot initialise Evolution's mail summary component."
+#: mail/component-factory.c:266
+msgid "Cannot register storage with shell"
+msgstr ""
 
-#: mail/component-factory.c:248
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Cannot initialise Evolution's mail storage hash."
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
+msgstr ""
 
-#: mail/folder-browser.c:485
-msgid "Full Search"
+#: mail/folder-browser.c:153
+msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:490
-msgid "Save"
+#: mail/folder-browser.c:154
+msgid "Body contains"
+msgstr ""
+
+#: mail/folder-browser.c:155
+msgid "Subject contains"
+msgstr ""
+
+#: mail/folder-browser.c:156
+msgid "Body does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:157
+msgid "Subject does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:458
+msgid "Filter on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+msgid "Open"
+msgstr ""
+
+#: mail/folder-browser.c:466
+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
+msgid "Print"
+msgstr ""
+
+#: mail/folder-browser.c:469
+msgid "Reply to Sender"
+msgstr ""
+
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
+msgid "Reply to All"
 msgstr ""
 
-#: mail/mail-autofilter.c:76
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr ""
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+msgid "Forward inline"
+msgstr ""
+
+#: mail/folder-browser.c:474
+msgid "Mark as Read"
+msgstr ""
+
+#: mail/folder-browser.c:475
+msgid "Mark as Unread"
+msgstr ""
+
+#: mail/folder-browser.c:477
+msgid "Move to Folder..."
+msgstr ""
+
+#: mail/folder-browser.c:478
+msgid "Copy to Folder..."
+msgstr ""
+
+#: mail/folder-browser.c:480
+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
+msgid "Apply Filters"
+msgstr ""
+
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
+
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:230
+#: mail/mail-autofilter.c:214
 #, c-format
-msgid "Mail from %s"
+msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:284 mail/mail-autofilter.c:333
-msgid "Add Filter Rule"
+#: mail/mail-autofilter.c:230
+#, c-format
+msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:73
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -2909,54 +3999,118 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:113
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:127
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:243
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+msgid "You have no mail sources configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:213
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:222
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:513
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:515
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:617
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:716
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-callbacks.c:748
+msgid "Save Message As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:750
+msgid "Save Messages As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:761 mail/message-list.c:1562
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr ""
 
-#: mail/mail-callbacks.c:808
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr ""
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -2966,55 +4120,63 @@ msgstr ""
 "optionally, enter the name of your organisation, and the name of a file to "
 "read your signature from."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr ""
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr ""
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr ""
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr ""
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr ""
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr ""
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr ""
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr ""
 
-#: mail/mail-config-gui.c:941
+#: 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 ""
 
-#: mail/mail-config-gui.c:980
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr ""
 
-#: mail/mail-config-gui.c:1112 mail/mail-config-gui.c:1160
+#: mail/mail-config-gui.c:1130
+msgid "Mail source type:"
+msgstr ""
+
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3023,7 +4185,11 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1136
+#: mail/mail-config-gui.c:1154
+msgid "News source type:"
+msgstr ""
+
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3032,674 +4198,768 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1155
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1210
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1212
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1310
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr ""
 
-#: mail/mail-config-gui.c:1312
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr ""
 
-#: mail/mail-config-gui.c:1407
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr ""
 
-#: mail/mail-config-gui.c:1409
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr ""
 
-#: mail/mail-config-gui.c:2283
+#: mail/mail-config-gui.c:2253
+#, c-format
+msgid "Testing \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2255
+#, c-format
+msgid "Test connection to \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr ""
 
-#: mail/mail-config-gui.c:2333
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Querying authorisation capabilities of \"%s\""
 
-#: mail/mail-config-gui.c:2335
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "Query authorisation at \"%s\""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+#: po/tmp/mail-config.glade.h:7
+msgid "Address"
 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.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
+#: po/tmp/mail-config.glade.h:10
 msgid "Identities"
 msgstr ""
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Organisation"
-
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr ""
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
+#: po/tmp/mail-config.glade.h:11
+msgid "Mail Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
-msgid "Mail Sources"
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr ""
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "Organisation"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
 msgstr ""
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr ""
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:600
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr ""
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
+#: mail/mail-display.c:90
+#, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
+#: mail/mail-display.c:113
+#, c-format
+msgid "Could not write data: %s"
+msgstr ""
+
+#: mail/mail-display.c:218
+msgid "Save Attachment"
 msgstr ""
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:258
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:322
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:500
+#, c-format
+msgid "%s attachment"
+msgstr ""
+
+#: mail/mail-format.c:623
+msgid "Reply-To:"
+msgstr ""
+
+#: mail/mail-format.c:845
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+msgid "Encrypted message not displayed"
+msgstr ""
+
+#: mail/mail-format.c:863
+msgid "Encrypted message"
+msgstr ""
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1486
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
+#: mail/mail-local.c:261
+msgid "Closing current folder"
+msgstr ""
+
+#: mail/mail-local.c:293
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:314
+msgid "Creating new folder"
+msgstr ""
+
+#: mail/mail-local.c:329
+msgid "Copying messages"
 msgstr ""
 
-#: mail/mail-ops.c:68
+#: mail/mail-local.c:341
 #, c-format
-msgid "Fetching email from %s"
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
+msgstr ""
+
+#: mail/mail-local.c:372
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
+#: mail/mail-local.c:781
+msgid "Registering local folder"
+msgstr ""
+
+#: mail/mail-local.c:783
+msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:79
 #, c-format
-msgid "Fetch email from %s"
+msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:109
+#: mail/mail-ops.c:81
 #, c-format
-msgid "Retrieving messages : %s"
+msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:252
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:309
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:440
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:445
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:448
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:451
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:595
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:597
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:733 mail/mail-ops.c:740
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:737 mail/mail-ops.c:743
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:815
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:817
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:876
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:878
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:881
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:883
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr ""
 
-#: mail/mail-ops.c:937
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1016
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1019
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1050
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:1170
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1173
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1244 mail/subscribe-dialog.c:163
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr ""
 
-#: mail/mail-ops.c:1304
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1307
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1410
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1415
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1418
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1423
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1460
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1477
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1563
+#: mail/mail-ops.c:1665
+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:1565
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1667
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1669
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1763
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1765
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-ops.c:1828
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1831
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1834
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2053
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2055
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2122
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2125
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2151
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-threads.c:299
+#: mail/mail-ops.c:2428
+#, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2431
+#, c-format
+msgid "Save messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2474
+#, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:104
+msgid "Cancel"
+msgstr ""
+
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:648
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:701
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:705
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:770
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:889
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:899
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:294
+#. Get all uids of source
+#: mail/mail-tools.c:239
+#, c-format
+msgid "Examining %s"
+msgstr ""
+
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#: mail/mail-tools.c:387
+#. Info
+#: mail/mail-tools.c:290
+#, c-format
+msgid "Retrieving message %d of %d"
+msgstr ""
+
+#. Append it to dest
+#: mail/mail-tools.c:303
 #, c-format
-msgid "[%s] %s"
+msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:389
+#: mail/mail-tools.c:332
+#, c-format
+msgid "Saving changes to %s"
+msgstr ""
+
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:398
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:549
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr ""
-
-#: mail/mail-tools.c:578
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:147
+msgid "VFolders"
+msgstr ""
+
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:151 ui/evolution-mail.h:47
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr ""
 
-#: mail/mail-view.c:151 ui/evolution-mail.h:48
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:154 mail/message-list.c:1565 ui/evolution-mail.h:49
-msgid "Reply to All"
-msgstr ""
-
-#: mail/mail-view.c:154 ui/evolution-mail.h:50
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:51
-msgid "Forward"
-msgstr ""
-
-#: mail/mail-view.c:157 ui/evolution-mail.h:52
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:161 ui/evolution-addressbook.h:18
-#: ui/evolution-calendar.h:24 ui/evolution-mail.h:57
-msgid "Print"
-msgstr ""
-
-#: mail/mail-view.c:161 ui/evolution-mail.h:58
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr ""
 
-#: mail/mail-view.c:163 ui/evolution-mail.h:60
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr ""
 
-#: mail/message-list.c:1560
-msgid "Open in New Window"
-msgstr ""
-
-#: mail/message-list.c:1561
-msgid "Edit Message"
+#: mail/message-list.c:572
+msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:1564
-msgid "Reply to Sender"
+#: mail/message-list.c:575
+msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:1566
-msgid "Forward Message"
+#: mail/message-list.c:578
+msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:1568
-msgid "Delete Message"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
 msgstr ""
 
-#: mail/message-list.c:1569
-msgid "Move Message"
+#. 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
+#, c-format
+msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:1570
-msgid "Copy Message"
+#: mail/message-list.c:860 mail/message-list.c:875
+msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:1572
-msgid "VFolder on Subject"
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
 msgstr ""
 
-#: mail/message-list.c:1573
-msgid "VFolder on Sender"
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
 msgstr ""
 
-#: mail/message-list.c:1574
-msgid "VFolder on Recipients"
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/message-list.c:1576
-msgid "Filter on Subject"
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1577
-msgid "Filter on Sender"
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1578
-msgid "Filter on Recipients"
+#: mail/subscribe-dialog.c:282
+#, c-format
+msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1579 mail/message-list.c:1602
-msgid "Filter on Mailing List"
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1604
+#: mail/subscribe-dialog.c:290
 #, c-format
-msgid "Filter on Mailing List (%s)"
+msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:118
-msgid "Display folders containing:"
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:152
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:197
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -3707,14 +4967,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -3722,7 +4982,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -3771,44 +5031,44 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr ""
 
-#: shell/e-shell-view.c:993
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr ""
 
-#: shell/e-shell-view.c:1133
+#: shell/e-shell.c:372
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:336
+#: shell/e-shell.c:1208
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
 msgstr ""
 
 #: shell/e-shortcuts-view.c:122
@@ -3878,67 +5138,65 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage.c:127
+#: 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
+msgid "_View"
+msgstr ""
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr ""
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr ""
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:340
-msgid "Unknown error"
-msgstr ""
-
-#: shell/e-storage-set-view.c:223 ui/evolution.h:15 ui/evolution.h:29
-msgid "_View"
-msgstr ""
-
-#: shell/e-storage-set-view.c:223
-msgid "View the selected folder"
-msgstr ""
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -3960,581 +5218,1119 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:123
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Cannot initialise the Evolution shell."
 
-#: shell/main.c:160
+#: shell/main.c:178
+msgid "Disable."
+msgstr ""
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Cannot initialise the Bonobo component system."
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
-msgid "_Actions"
-msgstr ""
-
-#: ui/evolution-addressbook-ldap.h:10
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-addressbook.h:9
-msgid "_Print Contacts..."
-msgstr ""
-
-#: ui/evolution-addressbook.h:11
-msgid "_New Contact"
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
+msgid "_Actions"
 msgstr ""
 
-#: ui/evolution-addressbook.h:12
-msgid "_Tools"
+#: po/tmp/evolution-addressbook.xml.h:7
+msgid "Create a new contact"
 msgstr ""
 
-#: ui/evolution-addressbook.h:13
-msgid "_Search for contacts"
+#: po/tmp/evolution-addressbook.xml.h:9
+msgid "Delete a contact"
 msgstr ""
 
-#: ui/evolution-addressbook.h:14 ui/evolution-calendar.h:22
-msgid "New"
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
+msgid "Find"
 msgstr ""
 
-#: ui/evolution-addressbook.h:15
-msgid "Create a new contact"
+#: po/tmp/evolution-addressbook.xml.h:11
+msgid "Find a contact"
 msgstr ""
 
-#: ui/evolution-addressbook.h:16
-msgid "Find"
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+msgid "New"
 msgstr ""
 
-#: ui/evolution-addressbook.h:17
-msgid "Find a contact"
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.h:19
-msgid "Print contacts"
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.h:21
-msgid "Delete a contact"
+#: po/tmp/evolution-addressbook.xml.h:16
+msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.h:22
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr ""
 
-#: ui/evolution-addressbook.h:23
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.h:24
-msgid "Stop"
+#: po/tmp/evolution-addressbook.xml.h:19
+msgid "_Print Contacts..."
 msgstr ""
 
-#: ui/evolution-addressbook.h:25
-msgid "Stop Loading"
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+msgid "_Tools"
 msgstr ""
 
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.h:9 ui/evolution.h:14
-msgid "_New"
+#: po/tmp/evolution-calendar.xml.h:6
+msgid "5 Days"
 msgstr ""
 
-#: ui/evolution-calendar.h:10
-msgid "New Ca_lendar"
+#: po/tmp/evolution-calendar.xml.h:7
+msgid "Alter preferences"
 msgstr ""
 
-#: ui/evolution-calendar.h:11
-msgid "Create a new calendar"
+#: po/tmp/evolution-calendar.xml.h:8
+msgid "Ca_lendar"
 msgstr ""
 
-#: ui/evolution-calendar.h:12
-msgid "_Open"
+#: po/tmp/evolution-calendar.xml.h:9
+msgid "Calendar Preferences..."
 msgstr ""
 
-#: ui/evolution-calendar.h:13
-msgid "_Open Calendar"
+#: po/tmp/evolution-calendar.xml.h:10
+msgid "Create a new appointment"
 msgstr ""
 
-#: ui/evolution-calendar.h:14
-msgid "Open a calendar"
+#: po/tmp/evolution-calendar.xml.h:11
+msgid "Create a new calendar"
 msgstr ""
 
-#: ui/evolution-calendar.h:15
-msgid "_Save Calendar As"
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
 msgstr ""
 
-#: ui/evolution-calendar.h:16
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-calendar.h:17
-msgid "_Print this calendar"
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
 msgstr ""
 
-#: ui/evolution-calendar.h:18
-msgid "_New appointment..."
+#: po/tmp/evolution-calendar.xml.h:15
+msgid "Go to"
 msgstr ""
 
-#: ui/evolution-calendar.h:19 ui/evolution-calendar.h:23
-msgid "Create a new appointment"
+#: po/tmp/evolution-calendar.xml.h:16
+msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.h:20
-msgid "Calendar Preferences..."
+#: po/tmp/evolution-calendar.xml.h:17
+msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.h:21
-msgid "Alter preferences"
+#: po/tmp/evolution-calendar.xml.h:18
+msgid "Month"
 msgstr ""
 
-#: ui/evolution-calendar.h:25
-msgid "Print this calendar"
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+msgid "Next"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:21
+msgid "Open a calendar"
 msgstr ""
 
-#: ui/evolution-calendar.h:26
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr ""
 
-#: ui/evolution-calendar.h:27
-msgid "Go back in time"
+#: po/tmp/evolution-calendar.xml.h:24
+msgid "Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.h:28 widgets/misc/e-dateedit.c:331
-msgid "Today"
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-calendar.h:29
-msgid "Go to present time"
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
 msgstr ""
 
-#: ui/evolution-calendar.h:30
-msgid "Next"
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
 msgstr ""
 
-#: ui/evolution-calendar.h:31
-msgid "Go forward in time"
+#: po/tmp/evolution-calendar.xml.h:28
+msgid "Show 1 week"
 msgstr ""
 
-#: ui/evolution-calendar.h:32
-msgid "Go to"
+#: po/tmp/evolution-calendar.xml.h:29
+msgid "Show the working week"
 msgstr ""
 
-#: ui/evolution-calendar.h:33
-msgid "Go to a specific date"
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+msgid "Today"
 msgstr ""
 
-#: ui/evolution-calendar.h:34
-msgid "Day"
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
 msgstr ""
 
-#: ui/evolution-calendar.h:35
-msgid "Show 1 day"
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+msgid "_New"
 msgstr ""
 
-#: ui/evolution-calendar.h:36
-msgid "5 Days"
+#: po/tmp/evolution-calendar.xml.h:33
+msgid "_Open Calendar"
 msgstr ""
 
-#: ui/evolution-calendar.h:37
-msgid "Show the working week"
+#: po/tmp/evolution-calendar.xml.h:34
+msgid "_Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.h:38
-msgid "Week"
+#: po/tmp/evolution-calendar.xml.h:35
+msgid "_Save Calendar As"
 msgstr ""
 
-#: ui/evolution-calendar.h:39
-msgid "Show 1 week"
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-calendar.h:40
-msgid "Month"
+#: po/tmp/evolution-contact-editor.xml.h:8
+msgid "Delete..."
 msgstr ""
 
-#: ui/evolution-calendar.h:41
-msgid "Show 1 month"
+#: po/tmp/evolution-contact-editor.xml.h:9
+msgid "Help"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:9
-#: ui/evolution.h:13
-msgid "_File"
+#: po/tmp/evolution-contact-editor.xml.h:10
+msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.h:10
-msgid "_Save"
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
+msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
+msgid "Print..."
 msgstr ""
 
-#: ui/evolution-contact-editor.h:13
-msgid "_Print"
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
+msgid "Save _As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.h:15
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr ""
 
-#: ui/evolution-contact-editor.h:16
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-contact-editor.h:17
-msgid "Print..."
+#: po/tmp/evolution-contact-editor.xml.h:16
+msgid "Se_nd contact to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.h:18
-msgid "Print this item"
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
+msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
+#: po/tmp/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
+msgid "_File"
+msgstr ""
+
+#: po/tmp/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
+msgid "_Save"
 msgstr ""
 
 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.h:9
-msgid "_Threaded"
+#: po/tmp/evolution-event-editor.xml.h:6
+msgid "About this application"
 msgstr ""
 
-#: ui/evolution-mail.h:10
-msgid "Threaded Message list"
+#: po/tmp/evolution-event-editor.xml.h:7
+msgid "About..."
 msgstr ""
 
-#: ui/evolution-mail.h:11
-msgid "Print message..."
+#: po/tmp/evolution-event-editor.xml.h:8
+msgid "Actio_ns"
 msgstr ""
 
-#: ui/evolution-mail.h:12
-msgid "Print message to the printer"
+#: po/tmp/evolution-event-editor.xml.h:9
+msgid "C_lear"
 msgstr ""
 
-#: ui/evolution-mail.h:13
-msgid "Print Preview of message..."
+#: po/tmp/evolution-event-editor.xml.h:10
+msgid "C_ut"
 msgstr ""
 
-#: ui/evolution-mail.h:14
-msgid "Previews the message to be printed"
+#: po/tmp/evolution-event-editor.xml.h:11
+msgid "Clear"
 msgstr ""
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:12
-msgid "Select _All"
+#: po/tmp/evolution-event-editor.xml.h:12
+msgid "Clear the selection"
 msgstr ""
 
-#: ui/evolution-mail.h:16
-msgid "_Invert Selection"
+#: po/tmp/evolution-event-editor.xml.h:14
+msgid "Close this appointment"
 msgstr ""
 
-#: ui/evolution-mail.h:17
-msgid "Mail _Filters..."
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+msgid "Copy"
 msgstr ""
 
-#: ui/evolution-mail.h:18
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-mail.h:19
-msgid "_Mail Configuration..."
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
 msgstr ""
 
-#: ui/evolution-mail.h:20
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-mail.h:21
-msgid "Forget _Passwords"
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
 msgstr ""
 
-#: ui/evolution-mail.h:22
-msgid "_Message"
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
 msgstr ""
 
-#: ui/evolution-mail.h:23
-msgid "_Open in New Window"
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
 msgstr ""
 
-#: ui/evolution-mail.h:24
-msgid "_Edit Message"
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-mail.h:25
-msgid "_Print Message"
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: ui/evolution-mail.h:26
-msgid "Reply to _Sender"
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: ui/evolution-mail.h:27
-msgid "Reply to _All"
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-mail.h:28
-msgid "_Forward"
+#: po/tmp/evolution-event-editor.xml.h:28
+msgid "FIXME: Define Print _Styles"
 msgstr ""
 
-#: ui/evolution-mail.h:29
-msgid "Mar_k As Read"
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-mail.h:30
-msgid "Mark As U_nread"
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-mail.h:32
-msgid "_Move to Folder"
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
 msgstr ""
 
-#: ui/evolution-mail.h:33
-msgid "_Copy to Folder"
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: ui/evolution-mail.h:34
-msgid "_VFolder on Subject"
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
 msgstr ""
 
-#: ui/evolution-mail.h:35
-msgid "VFolder on Se_nder"
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
 msgstr ""
 
-#: ui/evolution-mail.h:36
-msgid "VFolder on _Recipients"
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
 msgstr ""
 
-#: ui/evolution-mail.h:37
-msgid "_Filter on Subject"
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-mail.h:38
-msgid "Fi_lter on Sender"
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
 msgstr ""
 
-#: ui/evolution-mail.h:39
-msgid "Filter on Rec_ipients"
+#: po/tmp/evolution-event-editor.xml.h:38
+msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:14
-msgid "F_older"
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-mail.h:41
-msgid "_Expunge"
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: ui/evolution-mail.h:42
-msgid "_Configure Folder"
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: ui/evolution-mail.h:43
-msgid "Get Mail"
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
 msgstr ""
 
-#: ui/evolution-mail.h:44
-msgid "Send queued mail and retrieve new mail"
+#: po/tmp/evolution-event-editor.xml.h:43
+msgid "FIXME: Save Attac_hments..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:50
+msgid "FIXME: _Formatting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:54
+msgid "FIXME: _Mail Message"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:56
+msgid "FIXME: _Move to Folder..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:57
+msgid "FIXME: _New Appointment"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr ""
+
+#: po/tmp/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
+msgid "F_ormat"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:73
+msgid "N_ext"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:77
+msgid "Pre_vious"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:78
+msgid "Previous"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:79
+msgid "Print S_etup..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:80
+msgid "Print Setup"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:83
+msgid "Properties"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:84
+msgid "Redo"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:86
+msgid "Replace"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
+
+#: po/tmp/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
+msgid "Save the current file"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:99
+msgid "Select All"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:100
+msgid "Select everything"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr ""
+
+#: po/tmp/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
+msgid "_About..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "Colours"
+
+#: po/tmp/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
+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
+msgid "_Edit"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:111
+msgid "_Find..."
+msgstr ""
+
+#: po/tmp/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
+msgid "_Help"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:116
+msgid "_Paste"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:117
+msgid "_Print"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:118
+msgid "_Properties..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:119
+msgid "_Redo"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
 msgstr ""
 
-#: ui/evolution-mail.h:45
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr ""
 
-#: ui/evolution-mail.h:46
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr ""
 
-#: ui/evolution-mail.h:53
+#: po/tmp/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
+msgid "F_older"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:14
+msgid "Fi_lter on Sender"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:15
+msgid "Filter on Rec_ipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:20
+msgid "Get Mail"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:21
+msgid "Mail _Filters"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:22
+msgid "Manage Subscriptions"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Mar_k As Read"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:24
+msgid "Mark As U_nread"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr ""
 
-#: ui/evolution-mail.h:54
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr ""
 
-#: ui/evolution-mail.h:56
-msgid "Copy message to a new folder"
+#: po/tmp/evolution-mail.xml.h:27
+msgid "Previews the message to be printed"
 msgstr ""
 
-#: ui/evolution-subscribe.h:11 ui/evolution.h:28
-msgid "_Edit"
+#: po/tmp/evolution-mail.xml.h:29
+msgid "Print Preview of message..."
 msgstr ""
 
-#: ui/evolution-subscribe.h:13
-msgid "_Unselect All"
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
 msgstr ""
 
-#: ui/evolution-subscribe.h:15 ui/evolution-subscribe.h:17
-msgid "Subscribe"
+#: po/tmp/evolution-mail.xml.h:31
+msgid "Print message..."
 msgstr ""
 
-#: ui/evolution-subscribe.h:16 ui/evolution-subscribe.h:19
-msgid "Unsubscribe"
+#: po/tmp/evolution-mail.xml.h:35
+msgid "Reply to _All"
 msgstr ""
 
-#: ui/evolution-subscribe.h:18
-msgid "Add folder to your list of subscribed folders"
+#: po/tmp/evolution-mail.xml.h:36
+msgid "Reply to _Sender"
 msgstr ""
 
-#: ui/evolution-subscribe.h:20
-msgid "Remove folder from your list of subscribed folders"
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+msgid "Select _All"
 msgstr ""
 
-#: ui/evolution-subscribe.h:21
-msgid "Refresh List"
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-subscribe.h:22
-msgid "Refresh List of Folders"
+#: po/tmp/evolution-mail.xml.h:41
+msgid "Threaded Message list"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:42
+msgid "VFolder on Se_nder"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:43
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
+msgid "_Apply Filters"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:46
+msgid "_Configure Folder"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:47
+msgid "_Copy to Folder..."
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:49
+msgid "_Edit Message"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:51
+msgid "_Filter on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:52
+msgid "_Forward"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:55
+msgid "_Message"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:56
+msgid "_Move to Folder..."
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:57
+msgid "_Open in New Window"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:58
+msgid "_Print Message"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:59
+msgid "_Save Message As..."
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:60
+msgid "_Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+msgid "_Undelete"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:63
+msgid "_VFolder on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
 msgstr ""
 
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.h:9
-msgid "Show the _Shortcut Bar"
+#: po/tmp/evolution-message-composer.xml.h:6
+msgid "Attach"
 msgstr ""
 
-#: ui/evolution.h:10
-msgid "Toggle whether to show the shortcut bar"
+#: po/tmp/evolution-message-composer.xml.h:9
+msgid "Close the current file"
 msgstr ""
 
-#: ui/evolution.h:11
-msgid "Show the _Folder Bar"
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
 msgstr ""
 
-#: ui/evolution.h:12
-msgid "Toggle whether to show the folder bar"
+#: po/tmp/evolution-message-composer.xml.h:12
+msgid "Insert a file as text into the message"
 msgstr ""
 
-#: ui/evolution.h:16
-msgid "_Folder"
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert text file..."
 msgstr ""
 
-#: ui/evolution.h:17
-msgid "Evolution bar _shortcut"
+#: po/tmp/evolution-message-composer.xml.h:15
+msgid "Open a file"
 msgstr ""
 
-#: ui/evolution.h:18
-msgid "_Mail message (FIXME)"
+#: po/tmp/evolution-message-composer.xml.h:17
+msgid "Save As"
 msgstr ""
 
-#: ui/evolution.h:19
-msgid "_Appointment (FIXME)"
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: ui/evolution.h:20
-msgid "_Contact (FIXME)"
+#: po/tmp/evolution-message-composer.xml.h:20
+msgid "Save in folder..."
 msgstr ""
 
-#: ui/evolution.h:21
-msgid "_Task (FIXME)"
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
 msgstr ""
 
-#: ui/evolution.h:22
-msgid "_Go to Folder..."
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
 msgstr ""
 
-#: ui/evolution.h:23
-msgid "Display a different folder"
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:25
+msgid "Send _Later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:26
+msgid "Send _later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send the mail in HTML format"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:28
+msgid "Send the message later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:29
+msgid "Send the message now"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:30
+msgid "Send this message now"
 msgstr ""
 
-#: ui/evolution.h:24
-msgid "_Create New Folder..."
+#: po/tmp/evolution-message-composer.xml.h:31
+msgid "Show / hide attachments"
 msgstr ""
 
-#: ui/evolution.h:25
-msgid "Create a new folder"
+#: po/tmp/evolution-message-composer.xml.h:32
+msgid "Show _attachments"
 msgstr ""
 
-#: ui/evolution.h:26
+#: po/tmp/evolution-message-composer.xml.h:33
+msgid "Show attachments"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:41
+msgid "_Open..."
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr ""
 
-#: ui/evolution.h:27
+#: po/tmp/evolution.xml.h:8
+msgid "Evolution bar _shortcut"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.h:30
-msgid "_Settings"
+#: po/tmp/evolution.xml.h:10
+msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.h:31
-msgid "_Help"
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.h:32
-msgid "_Index"
+#: po/tmp/evolution.xml.h:12
+msgid "Show the _Folder Bar"
 msgstr ""
 
-#: ui/evolution.h:33
-msgid "Getting _Started"
+#: po/tmp/evolution.xml.h:13
+msgid "Show the _Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.h:34
-msgid "Using the _Mailer"
+#: po/tmp/evolution.xml.h:14
+msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.h:35
-msgid "Using the _Calendar"
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: po/tmp/evolution.xml.h:16
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:17
+msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.h:36
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
+#: po/tmp/evolution.xml.h:19
+msgid "Using the _Calendar"
 msgstr ""
 
-#: ui/evolution.h:38
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.h:39
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.h:40
-msgid "Show information about Evolution"
+#: po/tmp/evolution.xml.h:22
+msgid "_Appointment (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:23
+msgid "_Contact (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:26
+msgid "_Folder"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:27
+msgid "_Go to Folder..."
+msgstr ""
+
+#: po/tmp/evolution.xml.h:29
+msgid "_Index"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:30
+msgid "_Mail message (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:32
+msgid "_Settings"
+msgstr ""
+
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
 msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
@@ -4613,43 +6409,28 @@ msgstr ""
 msgid "All Attendees"
 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:2468
-msgid "%A, %B %d, %Y"
-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:415
-msgid "MTWTFSS"
-msgstr ""
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:325
+#: widgets/misc/e-dateedit.c:408
 msgid "Now"
 msgstr ""
 
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
-#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
-#: widgets/misc/e-dateedit.c:1127
+#. 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
 msgid "%H:%M"
 msgstr ""
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
-#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
-#: widgets/misc/e-dateedit.c:1130
+#. 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
 msgid "%I:%M %p"
 msgstr ""
 
@@ -4657,3 +6438,12 @@ msgstr ""
 #, c-format
 msgid "Group %i"
 msgstr ""
+
+#~ 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 faa97e4b56..4e752baa17 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2000-12-04 18:30+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -304,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:1006
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1127
-#: calendar/conduits/todo/todo-conduit.c:938 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
@@ -430,28 +430,28 @@ msgstr ""
 "Se ha producido un error cuando se intentaba\n"
 "obtener del demonio gnome-pilot la lista del pilot"
 
-#: addressbook/conduit/address-conduit.c:196
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "No pude cargar el cursor\n"
 
-#: addressbook/conduit/address-conduit.c:209
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
-#: addressbook/conduit/address-conduit.c:598
-#: calendar/conduits/calendar/calendar-conduit.c:710
-#: calendar/conduits/todo/todo-conduit.c:520
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:599
-#: calendar/conduits/calendar/calendar-conduit.c:711
-#: calendar/conduits/todo/todo-conduit.c:521
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
 
-#: addressbook/conduit/address-conduit.c:631
-#: addressbook/conduit/address-conduit.c:634
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "No pude leer informaciСn de la aplicaciСn de direcciones del pilot"
 
@@ -472,99 +472,6 @@ msgstr "Elemento(s) pertenecientes a esas categorМas:"
 msgid "Available Categories:"
 msgstr "CategorМas disponibles:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr "Asistente"
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "Trabajo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "Trabajo 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr "Fax del trabajo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr "Rellamada"
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "Coche"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "CompaЯМa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "Casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "Casa 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr "Fax de casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "RDSI"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-msgid "Mobile"
-msgstr "MСvil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: po/tmp/mail-config.glade.h:17
-msgid "Other"
-msgstr "Otro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "Otro fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr "Papel"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr "Principal"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "Correo electrСnico principal"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "Correo electrСnico 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "Correo electrСnico 3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -642,6 +549,11 @@ msgstr "_Fax del trabajo"
 msgid "_Mobile"
 msgstr "_MСvil"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Correo electrСnico principal"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "T_rabajo"
@@ -721,6 +633,94 @@ msgstr "No_tas:"
 msgid "Details"
 msgstr "Detalles"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Asistente"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Trabajo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Trabajo 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Fax del trabajo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Rellamada"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Coche"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "CompaЯМa"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Casa"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Casa 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Fax de casa"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "RDSI"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+msgid "Mobile"
+msgstr "MСvil"
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
+msgid "Other"
+msgstr "Otro"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Otro fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Papel"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Principal"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "Correo electrСnico 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "Correo electrСnico 3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -828,7 +828,7 @@ msgstr "_Apellido:"
 msgid "_Suffix:"
 msgstr "_Sufijo:"
 
-#: addressbook/gui/component/addressbook.c:266
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Como _mini tarjetas"
 
@@ -836,16 +836,16 @@ msgstr "Como _mini tarjetas"
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:272
+#: addressbook/gui/component/addressbook.c:269
 #: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Como _Tabla"
 
-#: addressbook/gui/component/addressbook.c:392
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "No es posible abrir la agenda de direcciones"
 
-#: addressbook/gui/component/addressbook.c:397
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -865,27 +865,27 @@ msgstr ""
 "LDAP, necesitarА descargar e instalar OpenLDAP y recompilar\n"
 "e instalar evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:533
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:540
+#: addressbook/gui/component/addressbook.c:534
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: addressbook/gui/component/addressbook.c:541
+#: addressbook/gui/component/addressbook.c:535
 msgid "Email contains"
 msgstr "El mensaje contiene"
 
-#: addressbook/gui/component/addressbook.c:627
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrarА el visor de carpetas"
 
@@ -938,6 +938,11 @@ msgstr "_Seleccionar nombres"
 msgid "Select name from List:"
 msgstr "Seleccionar nombre de la lista:"
 
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Buscar"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1050,7 +1055,7 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Guardar como vCard"
@@ -1073,11 +1078,6 @@ msgstr ""
 "\n"
 "Pulse dos veces aquМ para crear un nuevo contacto."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Buscar"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1251,14 +1251,14 @@ 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:538
-#: calendar/gui/e-week-view.c:287 calendar/gui/print.c:605
+#: 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:541
-#: calendar/gui/e-week-view.c:290 calendar/gui/print.c:604
+#: 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"
 
@@ -1271,13 +1271,13 @@ msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 "Utilidad de configuraciСn para el enlace <<calendario>> de evolution.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:666
-#: calendar/conduits/todo/todo-conduit.c:476
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:765
-#: calendar/conduits/calendar/calendar-conduit.c:768
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "No pude leer informaciСn de la aplicaciСn de calendario del pilot"
 
@@ -1289,8 +1289,8 @@ msgstr "Enlace Por Hacer de Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Utilidad de configuraciСn para el enlace \"todo\" de evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:575
 #: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicaciСn ToDo de la pilot"
 
@@ -1349,7 +1349,7 @@ msgstr "Guardar calendario"
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr "%a %m %d %Y"
 
@@ -1485,7 +1485,7 @@ msgstr "No hay un sumario disponible."
 #.
 #: 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:9
+#: po/tmp/evolution-message-composer.xml.h:8
 #: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Cerrar"
@@ -1594,7 +1594,7 @@ msgstr "Primer dМa de la semana:"
 msgid "Fri"
 msgstr "Vier"
 
-#: calendar/gui/event-editor.c:421 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "Viernes"
 
@@ -1622,7 +1622,7 @@ msgstr "Elementos dentro del plazo:"
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/event-editor.c:417 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "Lunes"
 
@@ -1638,7 +1638,7 @@ msgstr "Elementos fuera de plazo:"
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: filter/libfilter-i18n.h:16 po/tmp/cal-prefs-dialog.glade.h:39
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -1654,7 +1654,7 @@ msgstr "Recordatorios"
 msgid "Sat"
 msgstr "Sab"
 
-#: calendar/gui/event-editor.c:422 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "SАbado"
 
@@ -1679,7 +1679,7 @@ msgstr "Comienzo del dМa:"
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/event-editor.c:423 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "Domingo"
 
@@ -1691,7 +1691,7 @@ msgstr "Tabla de tares"
 msgid "Thu"
 msgstr "Jue"
 
-#: calendar/gui/event-editor.c:420 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "Jueves"
 
@@ -1711,7 +1711,7 @@ msgstr "Formato del tiempo:"
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/event-editor.c:418 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "Martes"
 
@@ -1723,7 +1723,7 @@ msgstr "Alarmas visuales"
 msgid "Wed"
 msgstr "Mier"
 
-#: calendar/gui/event-editor.c:419 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "MiИrcoles"
 
@@ -1739,29 +1739,6 @@ msgstr "minutos antes de que ocurra."
 msgid "seconds."
 msgstr "segundos."
 
-#: calendar/gui/dialogs/task-editor.c:656
-msgid "Edit Task"
-msgstr "Editar Tarea"
-
-#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:320
-msgid "No summary"
-msgstr "Sin resumen"
-
-#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:326
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
-
-#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:329
-#, c-format
-msgid "Task - %s"
-msgstr "Tarea - %s"
-
-#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:332
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Entrada del diario - %s"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1800,7 +1777,7 @@ 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:1018
+#: 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
 msgid "None"
@@ -1850,31 +1827,58 @@ msgstr "E_stado:"
 msgid "task-editor-dialog"
 msgstr "dialogo del editor de tareas"
 
-#: calendar/gui/e-calendar-table.c:328
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Editar Tarea"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Sin resumen"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Tarea - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Entrada del diario - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Abrir..."
 
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Abrir la tarea"
 
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Marcar como completa"
 
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Marcar la tarea como completa"
 
-#: calendar/gui/e-calendar-table.c:334 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:493 mail/mail-view.c:165
+#: 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 "Borrar"
 
-#: calendar/gui/e-calendar-table.c:335
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Borrar la tarea"
 
@@ -1885,50 +1889,50 @@ msgstr "%02i divisiones por 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:1196
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %b 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:1210
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %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:1223
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:2931 calendar/gui/e-day-view.c:2938
-#: calendar/gui/e-day-view.c:2947 calendar/gui/e-week-view.c:3164
-#: calendar/gui/e-week-view.c:3171 calendar/gui/e-week-view.c:3180
+#: 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
 msgid "New appointment..."
 msgstr "Nueva cita..."
 
-#: calendar/gui/e-day-view.c:2935 calendar/gui/e-day-view.c:2942
-#: calendar/gui/e-week-view.c:3168 calendar/gui/e-week-view.c:3175
+#: 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
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2936 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
 #: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2943 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Hacer esta cita movible"
 
-#: calendar/gui/e-day-view.c:2944 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Borrar esta ocurrencia"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Borrar todas las ocurrencias"
 
@@ -1939,52 +1943,6 @@ msgstr "Borrar todas las ocurrencias"
 msgid "%d %B"
 msgstr "%d de %B"
 
-#: calendar/gui/event-editor.c:314
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: calendar/gui/event-editor.c:391
-msgid "on"
-msgstr "en"
-
-#: calendar/gui/event-editor.c:416 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "dМa"
-
-#: calendar/gui/event-editor.c:541
-msgid "on the"
-msgstr "en el"
-
-#: calendar/gui/event-editor.c:548
-msgid "th"
-msgstr "╨"
-
-#: calendar/gui/event-editor.c:702
-msgid "occurrences"
-msgstr "ocurrencias"
-
-#: calendar/gui/event-editor.c:819
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
-
-#: calendar/gui/event-editor.c:2939 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -2145,6 +2103,40 @@ msgstr "semana(s)"
 msgid "year(s)"
 msgstr "aЯo(s)"
 
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Editar Cita"
+
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "en"
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dМa"
+
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr "en el"
+
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr "╨"
+
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "ocurrencias"
+
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
+
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "enero"
@@ -2592,7 +2584,7 @@ msgstr "AЯo actual (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:934
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -2769,6 +2761,19 @@ msgstr "La URL `%s' contiene un protocolo no vАlido"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "El nЗmero del puerto en la URL `%s' no es numИrico"
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"No pude obtener la entrada Kerberos:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr "Respuesta de autentificaciСn erronea desde el servidor."
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2779,7 +2784,7 @@ msgstr "Respuesta inexperada del servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -2802,7 +2807,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:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -2855,57 +2860,194 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "No puedo crear el directorio %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "No pude crear un resumen"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "Directorios de correo en el formato MH de UNIX (versiСn CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "Para guardar el correo local en directorios del tipo MH"
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "Archivos de correo en el formato mbox de UNIX (versiСn CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr "Para guardar el correo local en archivos del tipo mbox"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr "Archivos de correo en el formato maildir de UNIX (versiСn CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Para guardar el correo local en directorios del tipo maildir de qmail"
+
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr "La direcciСn %s no es absoluta"
+
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "%s no es un directorio normal"
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "No pude acceder a la carpeta: %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr "Los almacenadores locales no tienen una carpeta raМz"
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr "Los almacenadores locales no tienen una carpeta por defecto"
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr "Las carpetas locales no pueden ser anidadas."
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr "Archivo de correo local %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
+
+#: camel/providers/local/camel-local-store.c:297
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "No puedo aЯadir el mensaje al archivo mbox: %s"
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "No pude borrar el resumen la carpeta `%s': %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-store.c:306
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "No obtener el mensaje: %s"
+msgid "Could not delete folder index file `%s': %s"
+msgstr "No pude borrar el Мndice de la carpeta `%s': %s"
 
-#: camel/providers/local/camel-mbox-provider.c:34
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "Archivos de correo en el formato mbox de UNIX"
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "No pude aЯadir el mensaje a la carpeta tipo maildir: %s: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:36
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: 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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"Para leer el correo entregado por el sistema local, y para guardar el correo "
-"en el disco local."
+"No puedo obtener el mensaje; %s\n"
+"  %s"
 
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+msgid "No such message"
+msgstr "No existe ese mensaje"
+
+#
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
+msgstr "Contenido invАlido en el mensaje"
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"No puedo abrir el archivo `%s':\n"
+"No pude abrir la carpeta `%s':\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mbox-store.c:108
 #: camel/providers/local/camel-mh-store.c:103
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La carpeta `%s' no existe."
 
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"No pude crear la carpeta `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' no es un directorio tipo maildir."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "No pude borrar la carpeta `%s': %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "no es un directorio tipo maildir"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "No puedo abrir el buzСn: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "No puedo aЯadir el mensaje al archivo 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
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"No puedo obtener el mensaje; %s de la carpeta %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "La carpeta parece estar corrompida e irrecuperable."
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "Fallo la construcciСn del mensaje: ©BuzСn corrompido?"
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"No puedo abrir el archivo `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2916,16 +3058,12 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:126
 #: camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' no es un archivo normal."
 
 #: camel/providers/local/camel-mbox-store.c:145
 #: camel/providers/local/camel-mbox-store.c:168
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2935,175 +3073,85 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La carpeta `%s' no esta vacia. No fue borrada."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
+#: camel/providers/local/camel-mbox-summary.c:234
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "No pude cambiar el nombre de la carpeta %s a %s: ya existe el destino"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "No pude abrir la carpeta: %s: resumiendo desda la posiciСn %ld: %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Las carpetas de tipo Mbox no pueden ser anidadas."
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "Parseado erroneo del correo cerca de la posiciСn %ld en la carpeta %s"
 
-#: camel/providers/local/camel-local-store.c:200
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:341
 #, c-format
-msgid "Local mail file %s"
-msgstr "Archivo de correo local %s"
+msgid "Cannot summarise folder: %s: %s"
+msgstr "No puedo resumir la carpeta: %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
 #, c-format
-msgid "Could not open summary %s"
-msgstr "No puedo abrir el resumen %s"
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "No pude abrir la carpeta para resumirla: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:491
-#: camel/providers/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "No puedo abrir el archivo de correo temporal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
-msgstr "El resumen no concuerda, abortando sincronizaciСn"
-
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "El resumen no concuerda, falta la cabecera X-Evolution"
+#: 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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Resumen y carpeta no concuerdan, incluso despues de una sincronizaciСn"
 
 #: camel/providers/local/camel-mbox-summary.c:562
-#: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Error la escribir al archivo de correo temporal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "No puedo copiar datos al archivo de salida: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Error la escribir al archivo temporal: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:595
 #: camel/providers/local/camel-mbox-summary.c:748
-#: camel/providers/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "No pude cerrar la carpeta origen %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:604
-#: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "No pude cerrar la carpeta temporal: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:615
-#: camel/providers/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "No pude cambiar el nombre a la carpeta: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:817
-#: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Error desconocido: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "No pude cargar o crear el resumen"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
-msgstr "No pude aЯadir el mensaje 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-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"No puedo obtener el mensaje; %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "Directorios de correo en el formato MH de UNIX"
-
-#: camel/providers/local/camel-local-provider.c:37
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Para guardar el correo local en directorios del tipo MH"
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"No pude abrir la carpeta `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"No pude crear la carpeta `%s':\n"
-"%s"
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "No pude aЯadir el mensaje a la carpeta mh: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:116
-#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' no es un directorio."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "No pude borrar la carpeta `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "No pude cambiarle el nombre a la carpeta `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "No pude cambiarle el nombre a la carpeta `%s': %s existe"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "Las carpetas tipo MH no pueden ser anidadas."
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Directorio de correo local %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3121,7 +3169,7 @@ msgstr "Fallo al enviar el nombre de usuario al servidor"
 msgid "Server rejected username/password"
 msgstr "El servidor rechazo el nombre de usuario С la contraseЯa"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensaje %s no encontrado."
@@ -3360,7 +3408,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:118
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "adjunto"
 
@@ -3403,7 +3451,7 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:622
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "De:"
 
@@ -3415,7 +3463,7 @@ msgstr "Presione aquМ para acceder a la agenda"
 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:295 mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "A:"
 
@@ -3423,7 +3471,7 @@ msgstr "A:"
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -3443,7 +3491,7 @@ 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:313 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -3451,7 +3499,7 @@ msgstr "Asunto:"
 msgid "Enter the subject of the mail"
 msgstr "Escriba el asunto del mensaje"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3460,38 +3508,38 @@ msgstr ""
 "No pude abrir el archivo de firma %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:595
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:606
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Guardando cambios en el mensaje..."
 
-#: composer/e-msg-composer.c:650
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Guardar cambios en el mensaje..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Error guardando el mensaje en 'Drafts': %s"
 
-#: composer/e-msg-composer.c:735 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:741
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3501,27 +3549,27 @@ msgstr ""
 "\n"
 "©Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:763
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:889
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Ese archivo no existe."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Ese no es un archivo normal."
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Ese archivo no es legible."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ese archivo parece accesible pero open(2) ha fallado."
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3529,15 +3577,15 @@ msgstr ""
 "El archivo es muy largo (mАs de 100K).\n"
 "©Esta seguro que quiere aЯadirlo?"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Ha ocurrido un error mientras se leМa el archivo."
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:1416
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -3545,7 +3593,7 @@ msgstr "No pude crear una ventana para escribir el mensaje"
 msgid "Cannot initialize Evolution's composer."
 msgstr "No puedo inicializar el componente de escritura correo de Evolution."
 
-#: filter/e-search-bar.c:175
+#: filter/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "Bus_car"
 
@@ -3635,8 +3683,8 @@ msgstr "Comparar con"
 msgid "<click here to select a date>"
 msgstr "<piche aquМ para aЯadir una fecha>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "AЯadir Regla de Filtro"
 
@@ -3644,6 +3692,17 @@ msgstr "AЯadir Regla de Filtro"
 msgid "Edit Filter Rule"
 msgstr "Editar regla de filtro"
 
+#: filter/filter-editor.c:433
+#, fuzzy
+msgid "incoming"
+msgstr "Entrando"
+
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr "Saliente"
+
 #: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Editar filtros"
@@ -3669,15 +3728,15 @@ msgstr ""
 "Oops, te has olvidado de elegir una carpeta.\n"
 "Por favor vuelve y especifica una carpeta vАlida donde entregar el correo."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Escribir URI de la carpeta"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<pinche aquМ para seleccionar una carpeta>"
 
@@ -3709,31 +3768,31 @@ msgstr "Nombre de la regla:"
 msgid "Untitled"
 msgstr "Sin tМtulo"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Ejecutar acciones"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "si se cumple algЗn criterio"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "AЯadir criterio"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Quitar criterio"
 
-#: mail/folder-browser.c:479 po/tmp/filter.glade.h:8
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
 #: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Editar"
@@ -3788,154 +3847,142 @@ msgid "Expression"
 msgstr "ExpresiСn"
 
 #: filter/libfilter-i18n.h:9
-msgid "Flagged"
-msgstr "Marcado"
-
-#: filter/libfilter-i18n.h:10
 msgid "Forward to Address"
 msgstr "Reenviar a direcciСn"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Cuerpo del mensaje"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:11
 msgid "Message Header"
 msgstr "Cabecera del mensaje"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Se reciviС el mensaje"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Se enviС el mensaje"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: filter/libfilter-i18n.h:17
-msgid "Read"
-msgstr "Leer"
-
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:17
 msgid "Regex Match"
 msgstr "ExpresiСn regular"
 
-#: filter/libfilter-i18n.h:20
-msgid "Replied to"
-msgstr "Respondido a"
-
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Remitente"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:19
 msgid "Set Status"
 msgstr "Poner estado"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Fuente"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Cabecera especМfica"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
 msgid "Status"
 msgstr "Estado"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "despuИs de"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "antes"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "contiene"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "no contiene"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "no acaba en"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "no existe"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "no suena como"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "no comienza por"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "finaliza con"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "es mayor que"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "es menor que"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "no es"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "es"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "en С despuИs de"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "en С antes de"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "suena como"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "comienza por"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "estaba despuИs de"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "estaba antes de"
 
@@ -3959,138 +4006,130 @@ msgstr "AЯadir regla para carpeta virtual"
 msgid "Edit VFolder Rule"
 msgstr "Editar regla de VFolder"
 
-#: mail/component-factory.c:233
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:239
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "No puedo inicializar el componente de correo de Evolution."
-
-#: mail/component-factory.c:244
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "No puedo inicializar el componente para guardar correo de Evolution."
-
-#: mail/component-factory.c:282
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser.c:156 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:17
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Guardar"
 
-#: mail/folder-browser.c:169
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "El cuerpo y el asunto contienen"
 
-#: mail/folder-browser.c:170
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "El cuerpo no contiene"
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: mail/folder-browser.c:467
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr "VFolder segЗn el asunto"
 
-#: mail/folder-browser.c:468
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr "VFolder segЗn el remitente"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr "VFolder segЗn los destinatarios"
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr "Filtrar segЗn el asunto"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr "Filtrar segЗn el remitente"
 
-#: mail/folder-browser.c:473
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr "Filtrar segЗn los destinatarios"
 
-#: mail/folder-browser.c:474 mail/folder-browser.c:558
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr "Filtrar segЗn la lista de correo"
 
-#: mail/folder-browser.c:478 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "Abrir"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:466
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: mail/folder-browser.c:481 mail/mail-view.c:163
+#: 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
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:483
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Resp. Remitente"
 
-#: mail/folder-browser.c:484 mail/mail-view.c:156
+#: mail/folder-browser.c:470 mail/mail-view.c:156
 #: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: mail/folder-browser.c:485 mail/mail-view.c:159
+#: mail/folder-browser.c:471 mail/mail-view.c:159
 #: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Reenviar dentro del mensaje"
 
-#: mail/folder-browser.c:488
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "Marcar como leМdo"
 
-#: mail/folder-browser.c:489
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Marcar como no leМdo"
 
-#: mail/folder-browser.c:491
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "Mover a la carpeta..."
 
-#: mail/folder-browser.c:492
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "Copiar a la carpeta..."
 
-#: mail/folder-browser.c:494
+#: mail/folder-browser.c:480
 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:498
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:500 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Crear una regla con el mensaje"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar segЗn la lista de correo (%s)"
@@ -4110,7 +4149,7 @@ msgstr "Asunto es %s"
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
@@ -4167,15 +4206,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:542
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:544
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:659
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4183,15 +4222,27 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Drafts."
 
-#: mail/mail-callbacks.c:720
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "©Sobreescribir archivo?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Ya existe una archivo con ese nombre.\n"
+"©Sobreescribirlo?"
+
+#: mail/mail-callbacks.c:748
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:722
+#: mail/mail-callbacks.c:750
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:849
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4200,14 +4251,46 @@ msgstr ""
 "Error cargando la informaciСn del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:894
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:941
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresiСn del mensaje"
 
+#.
+#. * 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
+msgid "Identity"
+msgstr "Identidad"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "ConfiguraciСn del correo"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "Fuente del correo"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transporte del correo"
+
+#: 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"
+
+#: po/tmp/mail-config-druid.glade.h:14
+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"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4358,38 +4441,6 @@ msgstr "Averiguando las posibilidades de autentificaciСn de \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Probando la autentificaciСn de \"%s\""
 
-#.
-#. * 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
-msgid "Identity"
-msgstr "Identidad"
-
-#: po/tmp/mail-config-druid.glade.h:7
-msgid "Mail Configuration"
-msgstr "ConfiguraciСn del correo"
-
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Fuente del correo"
-
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Transporte del correo"
-
-#: 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"
-
-#: po/tmp/mail-config-druid.glade.h:14
-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"
-
 #: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "DirecciСn"
@@ -4426,51 +4477,24 @@ msgstr "Enviar el mensaje en formato HTML"
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "No pude crear un conducto con %s: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "No puedo ejecutar %s: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "No pude hacer un fork de %s: %s"
-
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Por favor introduzca su frase de paso PGP/GPG."
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "No se dio contraseЯa"
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No pude comunicar con GPG/PGP: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "No hay programas disponibles de GPG/PGP."
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
-msgstr "©Sobreescribir archivo?"
-
-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Ya existe una archivo con ese nombre.\n"
-"©Sobreescribirlo?"
-
-#: mail/mail-display.c:86
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4479,127 +4503,127 @@ msgstr ""
 "No pude abrir el archivo %s:\n"
 "%s"
 
-#: mail/mail-display.c:98
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vМa %s)"
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-format.c:501
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:624
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Responder a:"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:845
 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:858
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:865
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1467
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1482
 #, 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:1483
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1517
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1522
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-format.c:1692
+#: mail/mail-format.c:1695
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "El %s, %s escribiС:\n"
 
-#: mail/mail-local.c:194
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Cerrando carpeta actual"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Renombrando carpeta antigua y abriendola"
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Creando una nueva carpeta"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4608,7 +4632,7 @@ msgstr ""
 "No puedo guardar la metainformaciСn de la carpeta: probablemente\n"
 "volver a abrir esta carpeta: %s"
 
-#: mail/mail-local.c:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4616,286 +4640,291 @@ msgstr ""
 "Si no puede volver a abrir este buzon, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:669
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr "Registrando carpeta local"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "Registrar carpeta local"
 
-#: mail/mail-ops.c:78
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Recogiendo correo de %s"
 
-#: mail/mail-ops.c:80
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recoger correo de %s"
 
-#: mail/mail-ops.c:330
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "No hay correo nuevo en %s"
 
-#: mail/mail-ops.c:400
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtrando correo bajo demanda"
 
-#: mail/mail-ops.c:402
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Filtrar correo bajo demanda"
 
-#: mail/mail-ops.c:537
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "Enviando un mensaje sin asunto"
 
-#: mail/mail-ops.c:545
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "Enviado \"%s\""
 
 #
-#: mail/mail-ops.c:548
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Enviar un mensaje sin asunto"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "Enviando cola de correo"
 
-#: mail/mail-ops.c:721
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Enviar cola"
 
-#: mail/mail-ops.c:857 mail/mail-ops.c:864
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "AЯadiendo \"%s\""
 
-#: mail/mail-ops.c:861 mail/mail-ops.c:867
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "AЯadiendo un mensaje sin asunto"
 
-#: mail/mail-ops.c:939
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Comprimiendo \"%s\""
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Comprimir \"%s\""
 
-#: mail/mail-ops.c:1000
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Moviendo mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1002
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copiando mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1005
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1007
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copiar mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1038
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:1041
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1061
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1140
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Marcando mensajes en la carpeta \"%s\""
 
-#: mail/mail-ops.c:1143
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Marcar mensajes en la carpeta \"%s\""
 
-#: mail/mail-ops.c:1174
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Marcando mensajes %d of %d"
 
-#: mail/mail-ops.c:1297
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1299
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Escanear carpetas en \"%s\""
 
-#: mail/mail-ops.c:1368 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Sin descripciСn)"
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Adjuntando mensajes desde la carpeta \"%s\""
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Adjuntar mensajes desde \"%s\""
 
-#: mail/mail-ops.c:1532
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Reenviando mensajes \"%s\""
 
-#: mail/mail-ops.c:1536
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Reenviando mensajes sin asunto"
 
-#: mail/mail-ops.c:1539
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Reenviar mensaje \"%s\""
 
-#: mail/mail-ops.c:1543
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Reenviar mensaje sin asunto"
 
-#: mail/mail-ops.c:1590
+#: mail/mail-ops.c:1593
 #, 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:1606
+#: mail/mail-ops.c:1610
 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:1650
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "Mensaje reenviado:\n"
+
+#: mail/mail-ops.c:1679
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-ops.c:1719
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Cargando \"%s\""
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Cargar \"%s\""
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Creando \"%s\""
 
-#: mail/mail-ops.c:1826
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Crear \"%s\""
 
-#: mail/mail-ops.c:1874
+#: mail/mail-ops.c:1903
 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:1920
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Sincronizando \"%s\""
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Sincronizar \"%s\""
 
-#: mail/mail-ops.c:1986
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Mostrando mensaje UID \"%s\""
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "Limpiando vista del mensaje"
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Mostrar mensaje UID \"%s\""
 
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "Limpiar vista del mensaje"
 
-#: mail/mail-ops.c:2108
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Abriendo mensajes desde la carpeta \"%s\""
 
-#: mail/mail-ops.c:2111
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Abrir mensajes desde \"%s\""
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Cargando carpeta %s"
 
-#: mail/mail-ops.c:2217
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "Cargar carpeta %s"
 
-#: mail/mail-ops.c:2281
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Mostrando mensajes desde la carpeta \"%s\""
 
-#: mail/mail-ops.c:2284
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Mostrar mensajes desde \"%s\""
 
-#: mail/mail-ops.c:2310
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Recogiendo mensaje %d de %d (uid \"%s\") "
 
-#: mail/mail-ops.c:2399
+#: mail/mail-ops.c:2428
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Guardando mensajes de la carpeta \"%s\""
 
-#: mail/mail-ops.c:2402
+#: mail/mail-ops.c:2431
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Guardando mensajes de la carpeta \"%s\""
 
-#: mail/mail-ops.c:2444
+#: mail/mail-ops.c:2474
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
@@ -4904,7 +4933,7 @@ msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: mail/mail-summary.c:104 mail/mail-threads.c:728
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "║Mesaje escrito incompleto en la tuberМa!"
 
@@ -5038,38 +5067,38 @@ msgstr "Imprimir el mensaje seleccionado"
 msgid "Delete this message"
 msgstr "Borrar este mensaje"
 
-#: mail/message-list.c:554
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:557
+#: mail/message-list.c:575
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:560
+#: mail/message-list.c:578
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:828
+#: mail/message-list.c:846
 #, 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:840 mail/message-list.c:855
+#: mail/message-list.c:858 mail/message-list.c:873
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:842 mail/message-list.c:857
+#: mail/message-list.c:860 mail/message-list.c:875
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: mail/message-list.c:2140
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "Reconstruyendo la vista del mensaje"
 
-#: mail/message-list.c:2142
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Reconstruir la vista del mensaje"
 
@@ -5248,25 +5277,25 @@ msgstr ""
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrandose)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:1022
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1160
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5344,65 +5373,65 @@ msgstr "Quitar este atajo de la lista de atajos"
 msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
-#: shell/e-storage.c:128
+#: 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
+msgid "_View"
+msgstr "_Ver"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Ver la carpeta seleccionada"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Sin nombre)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Sin errores"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Error genИrico"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Ya existe una carpeta con ese nombre"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Es tipo de fichero especificado no es vАlido"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "Error de I/O"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "No hay suficiente espacio para crear la carpeta"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "No se encontro la carpeta especificada"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "FunciСn sin implementar en este manejador"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "OperaciСn no soportada"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "El tipo especificado no esta soportado poe este manejador"
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
-msgid "_View"
-msgstr "_Ver"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Ver la carpeta seleccionada"
-
-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5444,7 +5473,7 @@ msgstr ""
 "Esperamos que le gusten los resultados de nuestro duro trabajo, y\n"
 "esperamos sus contribuciones\n"
 
-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5452,15 +5481,15 @@ msgstr ""
 "GrАcias\n"
 "El equipo de Evolution\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "No pued inicializar la shell de Evolution."
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr "Deshabilitado."
 
-#: shell/main.c:164
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "No puedo inicializar el sistema de componentes Bonobo."
 
@@ -5674,7 +5703,7 @@ 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:19
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
@@ -5703,7 +5732,7 @@ 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:40
+#: po/tmp/evolution-message-composer.xml.h:38
 #: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "_Archivo"
@@ -5714,7 +5743,7 @@ 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:44
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -5951,7 +5980,7 @@ 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
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "F_ormatear"
 
@@ -6028,7 +6057,7 @@ 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:22
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
@@ -6073,12 +6102,12 @@ 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:36
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "_Acerca de..."
 
 #: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -6087,12 +6116,12 @@ msgid "_Copy"
 msgstr "_Copiar"
 
 #: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr "_Depurar"
 
 #: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-message-composer.xml.h:37
 #: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "_Editar"
@@ -6106,7 +6135,7 @@ msgid "_Forms"
 msgstr "_Formularios"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Ayuda"
 
@@ -6327,7 +6356,8 @@ msgid "_VFolder on Subject"
 msgstr "_VFolder segЗn el asunto"
 
 #: po/tmp/evolution-mail.xml.h:64
-msgid "_Vitrual Folder Editor"
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "Editor de carpeta _virtuales"
 
 #.
@@ -6338,99 +6368,91 @@ msgstr "Editor de carpeta _virtuales"
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: po/tmp/evolution-message-composer.xml.h:8
-msgid "Bold"
-msgstr "Negrita"
-
-#: po/tmp/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Cerrar el archivo actual"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:12
 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
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "Insertar un archivo de texto..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Guardar como"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "Save in _folder... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:22
 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:24
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta especМfica"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Enviar"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "Enviar _mas tarde"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "Enviar el mensaje mАs tarde"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "Enviar el mensaje ahora"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "Enviar este mensaje ahora"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Sets something as bold"
-msgstr "Poner algo en negrita"
-
-#: po/tmp/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "Mostar _adjuntos"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "Mostar adjuntos"
 
-#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "_Insert text file... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "_Abrir..."
 
@@ -6562,6 +6584,13 @@ msgstr "_ConfiguraciСn"
 msgid "_Task (FIXME)"
 msgstr "_Task (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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Tentativa"
@@ -6638,13 +6667,6 @@ msgstr "Hora de _fin de la reuniСn:"
 msgid "All Attendees"
 msgstr "Todos los participantes"
 
-#. 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:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6675,177 +6697,95 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Grupo %i"
 
-#: camel/providers/imap/camel-imap-auth.c:124
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"No pude obtener la entrada Kerberos:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:195
-msgid "Bad authentication response from server."
-msgstr "Respuesta de autentificaciСn erronea desde el servidor."
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "Directorios de correo en el formato MH de UNIX (versiСn CamelLocal)"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "Archivos de correo en el formato mbox de UNIX (versiСn CamelLocal)"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Para guardar el correo local en archivos del tipo mbox"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr "Archivos de correo en el formato maildir de UNIX (versiСn CamelLocal)"
+#~ msgid "Could not create summary"
+#~ msgstr "No pude crear un resumen"
 
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Para guardar el correo local en directorios del tipo maildir de qmail"
+#~ msgid "Cannot append message to mbox file: %s"
+#~ msgstr "No puedo aЯadir el mensaje al archivo mbox: %s"
 
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "La direcciСn %s no es absoluta"
+#~ msgid "Cannot get message: %s"
+#~ msgstr "No obtener el mensaje: %s"
 
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "%s no es un directorio normal"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "Archivos de correo en el formato mbox de UNIX"
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "No pude acceder a la carpeta: %s: %s"
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Para leer el correo entregado por el sistema local, y para guardar el correo "
+#~ "en el disco local."
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Los almacenadores locales no tienen una carpeta raМz"
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr ""
+#~ "No pude cambiar el nombre de la carpeta %s a %s: ya existe el destino"
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Los almacenadores locales no tienen una carpeta por defecto"
+#~ msgid "Mbox folders may not be nested."
+#~ msgstr "Las carpetas de tipo Mbox no pueden ser anidadas."
 
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Las carpetas locales no pueden ser anidadas."
+#~ msgid "Could not open summary %s"
+#~ msgstr "No puedo abrir el resumen %s"
 
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "No pude cambiarle el nombre de la carpeta %s a %s: %s"
+#~ msgid "Summary mismatch, aborting sync"
+#~ msgstr "El resumen no concuerda, abortando sincronizaciСn"
 
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "No pude borrar el resumen la carpeta `%s': %s"
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "El resumen no concuerda, falta la cabecera X-Evolution"
 
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "No pude borrar el Мndice de la carpeta `%s': %s"
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "No puedo copiar datos al archivo de salida: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "No pude aЯadir el mensaje a la carpeta tipo maildir: %s: %s"
+#~ msgid "Could not load or create summary"
+#~ msgstr "No pude cargar o crear el resumen"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "No existe ese mensaje"
+#~ msgid "Cannot append message to mh folder: %s"
+#~ msgstr "No pude aЯadir el mensaje a la carpeta mh: %s"
 
-#
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
-msgid "Invalid message contents"
-msgstr "Contenido invАlido en el mensaje"
+#~ msgid "UNIX MH-format mail directories"
+#~ msgstr "Directorios de correo en el formato MH de UNIX"
 
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' no es un directorio tipo maildir."
+#~ msgid "Could not rename folder `%s': %s"
+#~ msgstr "No pude cambiarle el nombre a la carpeta `%s': %s"
 
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "no es un directorio tipo maildir"
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "No pude cambiarle el nombre a la carpeta `%s': %s existe"
 
-#: camel/providers/local/camel-mbox-folder.c:195
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "No puedo abrir el buzСn: %s: %s\n"
+#~ msgid "MH folders may not be nested."
+#~ msgstr "Las carpetas tipo MH no pueden ser anidadas."
 
-#: camel/providers/local/camel-mbox-folder.c:251
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "No puedo aЯadir el mensaje al archivo mbox: %s: %s"
+#~ msgid "Local mail directory %s"
+#~ msgstr "Directorio de correo local %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
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"No puedo obtener el mensaje; %s de la carpeta %s\n"
-"  %s"
+#~ msgid "Flagged"
+#~ msgstr "Marcado"
 
-#: camel/providers/local/camel-mbox-folder.c:358
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "La carpeta parece estar corrompida e irrecuperable."
+#~ msgid "Read"
+#~ msgstr "Leer"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Fallo la construcciСn del mensaje: ©BuzСn corrompido?"
+#~ msgid "Replied to"
+#~ msgstr "Respondido a"
 
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "No pude abrir la carpeta: %s: resumiendo desda la posiciСn %ld: %s"
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Parseado erroneo del correo cerca de la posiciСn %ld en la carpeta %s"
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr ""
+#~ "No puedo inicializar el componente para guardar correo de Evolution."
 
-#: camel/providers/local/camel-mbox-summary.c:341
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "No puedo resumir la carpeta: %s: %s"
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "No pude crear un conducto con %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "No pude abrir la carpeta para resumirla: %s: %s"
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "No puedo ejecutar %s: %s\n"
 
-#: 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
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Resumen y carpeta no concuerdan, incluso despues de una sincronizaciСn"
+#~ msgid "Cannot fork %s: %s"
+#~ msgstr "No pude hacer un fork de %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Error la escribir al archivo temporal: %s: %s"
+#~ msgid "Bold"
+#~ msgstr "Negrita"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "No pude aЯadir el mensaje a la carpeta mh: %s: %s"
+#~ msgid "Sets something as bold"
+#~ msgstr "Poner algo en negrita"
 
 #~ msgid "Forward as Attachment"
 #~ msgstr "Reenviar como adjunto"
diff --git a/po/fi.po b/po/fi.po
index b97f0158d0..db97c4fb91 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2000-11-14 14:38+0300\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-11-14 15:00+0300\n"
 "Last-Translator: Jarkko Ranta <jjranta@cc.joensuu.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -263,10 +263,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1012
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1092
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
@@ -385,28 +385,28 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:207
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:220
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:579
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:580
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:613
 #: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -427,105 +427,11 @@ msgstr ""
 msgid "Available Categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "TyЖ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "TyЖ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "Yritys"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "Koti"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "Koti 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-msgid "Mobile"
-msgstr "Matkapuhelin"
-
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#: addressbook/contact-editor/e-contact-editor.c:1373
-#: mail/mail-config.glade.h:18
-msgid "Other"
-msgstr "Muu"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "Muu faksi"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "Ensisijainen sДhkЖposti"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "SДhkЖposti 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "SДhkЖposti 3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Poista kontakti?"
 
@@ -539,7 +445,7 @@ msgid "_Add"
 msgstr "_LisДД"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Poista"
 
@@ -554,12 +460,11 @@ msgstr "Uusi puhelintyyppi"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
 #: addressbook/contact-editor/e-contact-editor-strings.h:11
-#: calendar/gui/event-editor-dialog.glade.h:53 filter/filter.glade.h:7
-#: mail/mail-config-druid.glade.h:10 mail/mail-config.glade.h:7
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "LisДД"
 
@@ -599,6 +504,11 @@ msgstr ""
 msgid "_Mobile"
 msgstr "_Matkapuhelin"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Ensisijainen sДhkЖposti"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr ""
@@ -612,7 +522,7 @@ msgid "C_ontacts..."
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegoriat"
 
@@ -629,7 +539,7 @@ msgid "_Address..."
 msgstr "_Osoite..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr ""
 
@@ -674,44 +584,145 @@ msgid "No_tes:"
 msgstr ""
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Yksityiskohdat"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "TyЖ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "TyЖ 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Auto"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Yritys"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Koti"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Koti 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+msgid "Mobile"
+msgstr "Matkapuhelin"
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
+msgid "Other"
+msgstr "Muu"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Muu faksi"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "SДhkЖposti 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "SДhkЖposti 3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Osoite _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:7
+#, fuzzy
+msgid "Canada"
+msgstr "Kalenteri"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Tarkista osoite"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "M_aa:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:10
+#, fuzzy
+msgid "Finland"
+msgstr "Etsi"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Osoite:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Kaupunki:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Osavaltio/Provinssi:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:14
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -763,25 +774,24 @@ msgstr "_Sukunimi:"
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:266
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:272
-#: ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:392
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Osoitekirjaa ei voitu avata"
 
-#: addressbook/gui/component/addressbook.c:397
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -790,30 +800,30 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 msgid "Show All"
 msgstr "NДytД kaikki"
 
-#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:533
 msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:540
+#: addressbook/gui/component/addressbook.c:534
 msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:541
+#: addressbook/gui/component/addressbook.c:535
 msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:627
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -823,66 +833,178 @@ msgstr "Ulkoiset hakemistot"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Kuvaus:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "LDAP-palvelin:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-#: mail/mail-config-druid.glade.h:37
+#: po/tmp/ldap-server-dialog.glade.h:8
 msgid "Name:"
 msgstr "Nimi:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Portin numero:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Etsi..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Vastaanottajat"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Valitse nimet"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Valitse nimi luettelosta"
 
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Etsi"
+
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:8
-msgid "window2"
+#: po/tmp/alphabet.glade.h:7
+#, fuzzy
+msgid "a"
+msgstr "am"
+
+#: po/tmp/alphabet.glade.h:8
+msgid "b"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: po/tmp/alphabet.glade.h:9
+msgid "c"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:10
+msgid "d"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:11
+#, fuzzy
+msgid "e"
+msgstr "Ke"
+
+#: po/tmp/alphabet.glade.h:12
+#, fuzzy
+msgid "f"
+msgstr "Jos"
+
+#: po/tmp/alphabet.glade.h:13
+msgid "g"
+msgstr ""
+
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+msgid "h"
+msgstr "h"
+
+#: po/tmp/alphabet.glade.h:15
+#, fuzzy
+msgid "i"
+msgstr "on"
+
+#: po/tmp/alphabet.glade.h:16
+msgid "j"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:17
+#, fuzzy
+msgid "k"
+msgstr "Ok"
+
+#: po/tmp/alphabet.glade.h:18
+msgid "l"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:19
+#, fuzzy
+msgid "m"
+msgstr "am"
+
+#: po/tmp/alphabet.glade.h:20
+msgid "n"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:21
+#, fuzzy
+msgid "o"
+msgstr "Ma"
+
+#: po/tmp/alphabet.glade.h:22
+#, fuzzy
+msgid "p"
+msgstr "pm"
+
+#: po/tmp/alphabet.glade.h:23
+msgid "q"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:24
+#, fuzzy
+msgid "r"
+msgstr "Pe"
+
+#: po/tmp/alphabet.glade.h:25
+#, fuzzy
+msgid "s"
+msgstr "on"
+
+#: po/tmp/alphabet.glade.h:26
+msgid "t"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:27
+#, fuzzy
+msgid "u"
+msgstr "Su"
+
+#: po/tmp/alphabet.glade.h:28
+msgid "v"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:29
+msgid "w"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:30
+msgid "x"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:31
+msgid "y"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:32
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr ""
@@ -900,197 +1022,190 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Etsi"
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
+#: po/tmp/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:8
+#: po/tmp/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:9
+#: po/tmp/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:10
+#: po/tmp/e-contact-print.glade.h:9
 msgid "Body"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:11
+#: po/tmp/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "Ala:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: po/tmp/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Mitat:"
 
-#: addressbook/printing/e-contact-print.glade.h:13
+#: po/tmp/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Kirjasin..."
 
-#: addressbook/printing/e-contact-print.glade.h:14
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Kirjasinlajit"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: po/tmp/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Alatunniste:"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: po/tmp/e-contact-print.glade.h:15
 msgid "Format"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: po/tmp/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "YlДtunniste:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
+#: po/tmp/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "YlД-/Alatunniste"
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:20
+#: po/tmp/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:21
+#: po/tmp/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Korkeus:"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
+#: po/tmp/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: po/tmp/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Vaaka"
 
-#: addressbook/printing/e-contact-print.glade.h:25
+#: po/tmp/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Vasen:"
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: po/tmp/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: po/tmp/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Reunukset"
 
-#: addressbook/printing/e-contact-print.glade.h:28
+#: po/tmp/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Sarakkeiden mДДrД:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
+#: po/tmp/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Asetukset"
 
-#: addressbook/printing/e-contact-print.glade.h:30
+#: po/tmp/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "Suunta"
 
-#: addressbook/printing/e-contact-print.glade.h:31
+#: po/tmp/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Sivu"
 
-#: addressbook/printing/e-contact-print.glade.h:32
+#: po/tmp/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Sivun asetukset:"
 
-#: addressbook/printing/e-contact-print.glade.h:33
+#: po/tmp/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Paperi"
 
-#: addressbook/printing/e-contact-print.glade.h:34
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "PaperilДhde:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Pysty"
 
-#: addressbook/printing/e-contact-print.glade.h:36
+#: po/tmp/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Esikatselu:"
 
-#: addressbook/printing/e-contact-print.glade.h:37
+#: po/tmp/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:38
+#: po/tmp/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Peilikuvareunukset"
 
-#: addressbook/printing/e-contact-print.glade.h:39
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Oikea:"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:41
+#: po/tmp/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr "Varjostus"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Koko:"
 
-#: addressbook/printing/e-contact-print.glade.h:43
+#: po/tmp/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:44
+#: po/tmp/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Tyylin nimi:"
 
-#: addressbook/printing/e-contact-print.glade.h:45
+#: po/tmp/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "YlД:"
 
-#: addressbook/printing/e-contact-print.glade.h:46
-#: mail/mail-config-druid.glade.h:66
+#: po/tmp/e-contact-print.glade.h:45
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
+#: po/tmp/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Leveys:"
 
-#: addressbook/printing/e-contact-print.glade.h:48
+#: po/tmp/e-contact-print.glade.h:47
 msgid "label26"
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
-#: calendar/cal-util/timeutil.c:100
-msgid "h"
-msgstr "h"
-
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
@@ -1099,13 +1214,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Virhe kommunikoitaessa kalenteripalvelimen kanssa"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1117,8 +1232,8 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1162,46 +1277,46 @@ msgstr ""
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Avaa kalenteri"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Tallenna kalenteri"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:344
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:347
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:350
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr ""
 
@@ -1233,7 +1348,7 @@ msgstr ""
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1242,51 +1357,50 @@ msgid ""
 msgstr ""
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr ""
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr ""
 
@@ -1304,382 +1418,467 @@ msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:10 ui/evolution-subscribe.xml.h:8
+#: 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
 msgid "Close"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:9 calendar/gui/gnome-cal.c:1466
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#: po/tmp/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "05 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "10 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: po/tmp/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "15 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: po/tmp/cal-prefs-dialog.glade.h:11
+#, fuzzy
+msgid "30 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "60 minutes"
+msgstr "minuuttia"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: po/tmp/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: po/tmp/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: po/tmp/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Kalenterin asetukset"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14 calendar/gui/prop.c:528
+#: po/tmp/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: po/tmp/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:842
+#: po/tmp/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19 calendar/gui/prop.c:610
+#: po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: po/tmp/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: po/tmp/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "PДivДn loppu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: po/tmp/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/gnome-month-item.c:741
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
 msgid "Fri"
 msgstr "Pe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Perjantai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: po/tmp/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/gnome-month-item.c:737
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
 msgid "Mon"
 msgstr "Ma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Maanantai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
+#: po/tmp/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Muistuta kaikista tapaamisista"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: po/tmp/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/gnome-month-item.c:742
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
 msgid "Sat"
 msgstr "La"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Lauantai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "NДytД tapaamisten lopetusajat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: po/tmp/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "NДytД viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: po/tmp/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "PДivДn alku:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/gnome-month-item.c:736
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
 msgid "Sun"
 msgstr "Su"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Sunnuntai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/gnome-month-item.c:740
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
 msgid "Thu"
 msgstr "To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:612
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Torstai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: po/tmp/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: po/tmp/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/gnome-month-item.c:738
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
 msgid "Tue"
 msgstr "Ti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/gnome-month-item.c:739
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
 msgid "Wed"
 msgstr "Ke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "tyЖviikko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: po/tmp/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr "minuuttia niitД ennen."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "sekuntia."
 
-#: calendar/gui/dialogs/task-editor.c:655
-msgid "Edit Task"
+#.
+#. * 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
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:316
-msgid "No summary"
-msgstr ""
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "_Luokitus"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:322
-#, c-format
-msgid "Appointment - %s"
-msgstr "Tapaaminen - %s"
+#: po/tmp/task-editor-dialog.glade.h:9
+#, fuzzy
+msgid "Cancelled"
+msgstr "Peruuta"
 
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:325
-#, c-format
-msgid "Task - %s"
+#: po/tmp/task-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Completed"
+msgstr "Poistettu"
+
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:328
-#, c-format
-msgid "Journal entry - %s"
+#: po/tmp/task-editor-dialog.glade.h:14
+#, fuzzy
+msgid "High"
+msgstr "Korkeus:"
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "% Comp_lete:"
+#: po/tmp/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Low"
+msgstr "nyt"
+
+#. 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
+msgid "None"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "C_lassification:"
-msgstr "_Luokitus"
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "Date Completed:"
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "TehtДvД"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: po/tmp/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "_Kontaktit..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: po/tmp/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioriteetti:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:294
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Tapaaminen - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:55 filter/filter.glade.h:8
-#: filter/libfilter-i18n.h:8 mail/folder-browser.c:476
-#: mail/mail-config-druid.glade.h:23 mail/mail-config.glade.h:9
-#: mail/mail-view.c:165 ui/evolution-addressbook.xml.h:9
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:12
+#: 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 "Poista"
 
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1173
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1187
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1200
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2631 calendar/gui/e-day-view.c:2638
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2930
-#: calendar/gui/e-week-view.c:2937 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c: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
 msgid "New appointment..."
 msgstr "Uusi tapaaminen..."
 
-#: calendar/gui/e-day-view.c:2635 calendar/gui/e-day-view.c:2642
-#: calendar/gui/e-week-view.c:2934 calendar/gui/e-week-view.c:2941
+#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
+#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
 msgid "Edit this appointment..."
 msgstr "Muokkaa tДtД tapaamista..."
 
-#: calendar/gui/e-day-view.c:2636 calendar/gui/e-week-view.c:2935
-#: ui/evolution-event-editor.xml.h:21
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Poista tДmД tapaaminen"
 
-#: calendar/gui/e-day-view.c:2643 calendar/gui/e-week-view.c:2942
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Tee tДstД tapaamisesta siirrettДvД"
 
-#: calendar/gui/e-day-view.c:2644 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2645 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1690,249 +1889,198 @@ msgstr ""
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:310
-msgid "Edit Appointment"
-msgstr "Muokkaa tapaamista"
+#.
+#. * 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
+msgid "A_ll day event"
+msgstr "_Koko pДivДn kestДvД tapahtuma"
 
-#: calendar/gui/event-editor.c:365
-msgid "on"
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
 msgstr ""
 
-#: calendar/gui/event-editor.c:389 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "pДivД"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr ""
 
-#: calendar/gui/event-editor.c:390 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Maanantai"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr ""
 
-#: calendar/gui/event-editor.c:391
-msgid "Tuesday"
-msgstr "Tiistai"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "PДivДД"
 
-#: calendar/gui/event-editor.c:392
-msgid "Wednesday"
-msgstr "Keskiviikko"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Joka"
 
-#: calendar/gui/event-editor.c:393
-msgid "Thursday"
-msgstr "Torstai"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Poikkeukset"
 
-#: calendar/gui/event-editor.c:394
-msgid "Friday"
-msgstr "Perjantai"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "Tuntia"
 
-#: calendar/gui/event-editor.c:395
-msgid "Saturday"
-msgstr "Lauantai"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr ""
 
-#: calendar/gui/event-editor.c:396 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Sunnuntai"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minuuttia"
 
-#: calendar/gui/event-editor.c:514
-msgid "on the"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "Muuta"
+
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:521
-msgid "th"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
 msgstr ""
 
-#: calendar/gui/event-editor.c:675
-msgid "occurrences"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Y_ksityinen"
+
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "Y_leinen"
+
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor.c:792
-msgid "This appointment contains recurrences that Evolution cannot edit."
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor.c:2820 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
 msgstr ""
 
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:38
+#: po/tmp/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "_Yhteenveto:"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
+#: po/tmp/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Aika"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "_Alkamisaika:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "_Loppumisaika:"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
-msgstr "_Koko pДivДn kestДvД tapahtuma"
-
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "Y_leinen"
-
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Y_ksityinen"
-
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: po/tmp/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Luottamuksellinen"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minuuttia"
-
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Hours"
-msgstr "Tuntia"
-
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "PДivДД"
-
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: po/tmp/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "_Loppumisaika:"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
+#: po/tmp/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34
+#: po/tmp/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "Reminder"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "Appointment Basics"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "_Alkamisaika:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "_AlkamispДivД:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "Recurrence Rule"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "No recurrence"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "Simple recurrence"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Custom recurrence"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Every"
-msgstr "Joka"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "day(s)"
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "week(s)"
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "month(s)"
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:48
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "for"
-msgstr ""
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "until"
+#: calendar/gui/event-editor.c:407
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:51
-msgid "forever"
-msgstr ""
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "pДivД"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "Exceptions"
-msgstr "Poikkeukset"
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-msgid "Modify"
-msgstr "Muuta"
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "label21"
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-msgid "Preview"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -2145,30 +2293,6 @@ msgstr ""
 msgid "ago"
 msgstr "sitten"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Yhteenveto:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr ""
-
 #: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
 #: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
@@ -2403,185 +2527,93 @@ msgstr ""
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:864
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr ""
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr ""
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr ""
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr ""
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr ""
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr ""
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr ""
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr ""
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr ""
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr ""
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr ""
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr ""
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr ""
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr ""
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr ""
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr ""
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr ""
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Asetukset"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr ""
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr ""
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr ""
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
+#. 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/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, c-format
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
-msgid "SMTWTFS"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:96
+#: camel/camel-lock.c:253
 #, c-format
-msgid "Could not check mail file %s: %s"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#: camel/camel-movemail.c:99
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "VIrhe luettaessa viestitiedostoa: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Virhe kirjoitettaessa vДliaikaista viestitiedostoa: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Viestin tallentaminen vДliaikaistiedostoon %s epДonnistui: %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(tuntematon virhe)"
 
@@ -2614,6 +2646,10 @@ msgstr ""
 msgid "(unknown host)"
 msgstr ""
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -2629,22 +2665,22 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:486
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:489
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2668,6 +2704,20 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Hakemistoa %s ei voitu luoda:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2678,16 +2728,20 @@ msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP-komento epДonnistui: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
@@ -2697,7 +2751,7 @@ msgstr "Odottamaton OK-vastaus IMAP-palvelimelta: %s"
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2746,203 +2800,284 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
-#, c-format
-msgid "Cannot append message to mbox file: %s"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
-#, c-format
-msgid "Cannot get message: %s"
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
-msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid ""
-"Could not open file `%s':\n"
-"%s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "`%s' ei ole tavallinen tiedosto."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Folder `%s' does not exist."
-msgstr "Kansiota `%s' ei ole olemassa."
+msgid "Local mail file %s"
+msgstr "Paikallinen viestitiedosto %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:134
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
 #, c-format
-msgid ""
-"Could not create file `%s':\n"
-"%s"
+msgid "Cannot append message to maildir folder: %s: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
+#: 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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
 #, c-format
-msgid "`%s' is not a regular file."
-msgstr "`%s' ei ole tavallinen tiedosto."
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#, fuzzy
+msgid "No such message"
+msgstr "Kirjoita viesti"
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+#, fuzzy
+msgid "Invalid message contents"
+msgstr "LДhetД _viesti kontaktille..."
 
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not delete folder `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:184
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
-msgid "Folder `%s' is not empty. Not deleted."
-msgstr ""
+msgid "Folder `%s' does not exist."
+msgstr "Kansiota `%s' ei ole olemassa."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr ""
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
 #, c-format
-msgid "Local mail file %s"
-msgstr "Paikallinen viestitiedosto %s"
+msgid "Could not delete folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "VДliaikaishakemistoa ei voitu luoda: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
+#: camel/providers/local/camel-mbox-folder.c:195
 #, c-format
-msgid "Could not open summary %s"
+msgid "Cannot open mailbox: %s: %s\n"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:688
+#: camel/providers/local/camel-mbox-folder.c:251
 #, c-format
-msgid "Cannot open temporary mailbox: %s"
+msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr "ViestiД ei saatu POP-palvelimelta %s: %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:776
+#: camel/providers/local/camel-mbox-store.c:101
 #, c-format
-msgid "Error writing to temp mailbox: %s"
+msgid ""
+"Could not open file `%s':\n"
+"%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
-msgid "Cannot copy data to output file: %s"
+msgid ""
+"Could not create file `%s':\n"
+"%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:832
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
-msgid "Could not close source folder %s: %s"
-msgstr ""
+msgid "`%s' is not a regular file."
+msgstr "`%s' ei ole tavallinen tiedosto."
 
-#: camel/providers/mbox/camel-mbox-summary.c:841
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
-msgid "Could not close temp folder: %s"
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:849
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
-msgid "Could not rename folder: %s"
+msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:861
+#: camel/providers/local/camel-mbox-summary.c:234
 #, c-format
-msgid "Unknown error: %s"
-msgstr "Tuntematon virhe: %s"
-
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Cannot append message to mh folder: %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-folder.c:405
+#: camel/providers/local/camel-mbox-summary.c:341
 #, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
+msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Hakemistoa %s ei voitu luoda: %s"
+
+#: camel/providers/local/camel-mbox-summary.c:491
+#, c-format
+msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
+#: 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
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:112
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:136
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
-msgid "`%s' is not a directory."
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
-msgid "Could not delete folder `%s': %s"
+msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
-msgid "Could not rename folder `%s': %s"
+msgid "Could not rename folder: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:194
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr ""
+msgid "Unknown error: %s"
+msgstr "Tuntematon virhe: %s"
 
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:214
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
-msgid "Local mail directory %s"
+msgid "`%s' is not a directory."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-auth.c:41
@@ -2962,7 +3097,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr ""
@@ -3012,16 +3147,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "ViestiД ei saatu POP-palvelimelta %s: %s"
@@ -3094,7 +3229,7 @@ msgid ""
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -3184,51 +3319,50 @@ msgid "%.1fG"
 msgstr ""
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:301 mail/mail-display.c:117
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "liite"
 
-#: composer/e-msg-composer-attachment-bar.c:397
-#: ui/evolution-message-composer.xml.h:8
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "LiitД tiedosto"
 
-#: composer/e-msg-composer-attachment-bar.c:444 filter/filter.glade.h:13
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
 #: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Poista"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "LisДД liite..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "LisДД viestiin liitetiedoston"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Tiedostonimi:"
 
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/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:599
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "LДhettДjД:"
 
@@ -3240,7 +3374,7 @@ msgstr ""
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:603
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Vastaanottaja:"
 
@@ -3248,7 +3382,7 @@ msgstr "Vastaanottaja:"
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:605
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr ""
 
@@ -3266,7 +3400,7 @@ msgid ""
 "appearing in the recipient list of the message."
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:607
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Aihe:"
 
@@ -3274,45 +3408,45 @@ msgstr "Aihe:"
 msgid "Enter the subject of the mail"
 msgstr "Anna sДhkЖpostin aihe"
 
-#: composer/e-msg-composer.c:426
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:593
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Tallenna nimellД..."
 
-#: composer/e-msg-composer.c:604
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Virhe tallennettaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:624
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "VIrhe avattaessa tiedostoa: %s"
 
-#: composer/e-msg-composer.c:646
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Tallennetaan muutokset..."
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr ""
 
-#: composer/e-msg-composer.c:689
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:733 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:739
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3322,27 +3456,27 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: composer/e-msg-composer.c:761
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Avaa tiedosto"
 
-#: composer/e-msg-composer.c:887
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Tiedostoa ei ole olemassa."
 
-#: composer/e-msg-composer.c:897
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Se ei ole tavallinen tiedosto."
 
-#: composer/e-msg-composer.c:907
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Tiedosto on olemassa, muttei lukukelpoinen."
 
-#: composer/e-msg-composer.c:917
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Tiedosto vaikutti avattavalta, mutta avaaminen epДonnistui."
 
-#: composer/e-msg-composer.c:939
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3350,15 +3484,15 @@ msgstr ""
 "Tiedosto on hyvin suuri (yli 100K).\n"
 "Haluatko varmasti liittДД sen?"
 
-#: composer/e-msg-composer.c:960
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Virhe luettaessa tiedostoa."
 
-#: composer/e-msg-composer.c:1337
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Kirjoita viesti"
 
-#: composer/e-msg-composer.c:1411
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3366,6 +3500,11 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Etsi"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "vuotta"
@@ -3444,8 +3583,8 @@ msgstr ""
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr ""
 
@@ -3453,7 +3592,16 @@ msgstr ""
 msgid "Edit Filter Rule"
 msgstr ""
 
-#: filter/filter-editor.c:456 filter/filter.glade.h:10
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr ""
 
@@ -3476,26 +3624,31 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
 "%s"
 msgstr ""
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr ""
 
@@ -3507,229 +3660,224 @@ msgstr "SДДnnЖn nimi: "
 msgid "Untitled"
 msgstr "NimetЖn"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Jos"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Suorita toiminnot"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "kaikki ehdot tДytetДДn"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "mikДДn ehdoista tДyttyy"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "LisДД ehto"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Poista ehto"
 
-#: filter/filter.glade.h:9 mail/folder-browser.c:463
-#: mail/mail-config-druid.glade.h:26 mail/mail-config.glade.h:10
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: filter/filter.glade.h:11
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr ""
 
-#: filter/filter.glade.h:12
+#: po/tmp/filter.glade.h:11
 msgid "Filter Rules"
 msgstr ""
 
-#: filter/filter.glade.h:14
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr ""
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr ""
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr ""
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:511
-msgid "Answered"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr ""
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopioi kansioon"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Otettu vastaan"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "LДhetetty"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Poistettu"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr ""
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr ""
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr ""
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Viesti lДhetetty"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Viesti vastaanotettu"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Viesti lДhetetty"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "SiirrД kansioon"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Vastaanottajat"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:508
-msgid "Seen"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "LДhettДjД"
 
-#: filter/libfilter-i18n.h:22
-msgid "Set Flag"
-msgstr ""
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Kokeile asetuksia"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "LДhde"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "La"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Aihe"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "jДlkeen"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "ennen"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "sisДltДД"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "ei sisДllД"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr ""
 
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr ""
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "on suurempi kuin"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "on pienempi kuin"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "ei ole"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "on"
 
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr ""
 
@@ -3753,128 +3901,131 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr ""
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Evolutionin sДhkЖpostin yhteenvetokomponentin alustus epДonnistui."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr ""
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:156 ui/evolution-event-editor.xml.h:89
-#: ui/evolution-message-composer.xml.h:18
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Tallenna"
 
-#: mail/folder-browser.c:169
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:170
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr ""
 
-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Aihe sisДltДД"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr ""
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Aihe ei sisДllД"
 
-#: mail/folder-browser.c:451
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:452
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:456
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr ""
 
-#: mail/folder-browser.c:458 mail/folder-browser.c:541
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr ""
 
-#: mail/folder-browser.c:462 ui/evolution-message-composer.xml.h:16
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "Avaa"
 
-#: mail/folder-browser.c:464 mail/mail-view.c:163
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:24
-#: ui/evolution-mail.xml.h:28
+#: mail/folder-browser.c:466
+#, fuzzy
+msgid "Save As..."
+msgstr "Tallenna _nimellД..."
+
+#: 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
 msgid "Print"
 msgstr "Tulosta"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Vastaa lДhettДjДlle"
 
-#: mail/folder-browser.c:467 mail/mail-view.c:156 ui/evolution-mail.xml.h:34
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Vastaa kaikille"
 
-#: mail/folder-browser.c:468 mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+msgid "Forward inline"
+msgstr ""
+
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "Merkitse luetuksi"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Merkitse lukemattomaksi"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "SiirrД kansioon..."
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "Kopioi kansioon..."
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:480
 msgid "Undelete"
 msgstr "Palauta"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:481
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr ""
 
-#: mail/folder-browser.c:483 ui/evolution-mail.xml.h:11
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
@@ -3894,7 +4045,7 @@ msgstr "Aihe on %s"
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr ""
@@ -3941,15 +4092,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:533
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "SiirrД viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Kopioi viesti(t) kansioon"
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3957,22 +4108,73 @@ msgstr ""
 "Voit muokata vain Luonnokset\n"
 "-kansiossa olevia viestejД."
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Tallenna nimellД..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Tallenna nimellД..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-callbacks.c:824
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/mail-callbacks.c:871
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Viestin tulostus epДonnistui"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:8
+#, fuzzy
+msgid "Mail Source"
+msgstr "Muokkaa lДhdettД"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -3982,59 +4184,63 @@ msgstr ""
 "myЖs halutessasi antaa organisaatiosi nimen, sekД tiedostonimen, josta "
 "allekirjoituksesi luetaan."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Koko nimi:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "SДhkЖpostiosoite:"
 
-#: mail/mail-config-druid.glade.h:41 mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organisaatio:"
 
-#: mail/mail-config-druid.glade.h:63 mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Allekirjoitustiedosto:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:20
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Allekirjoitustiedosto"
 
-#: mail/mail-config-druid.glade.h:62 mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: mail/mail-config-druid.glade.h:67 mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "KДyttДjДnimi:"
 
-#: mail/mail-config-druid.glade.h:43 mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Polku:"
 
-#: mail/mail-config-druid.glade.h:14 mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Todentaminen:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Etsi tuettuja tyyppejД..."
 
-#: mail/mail-config-druid.glade.h:24 mail/mail-config-gui.c:967
+#: 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 "дlД poista viestejД palvelimelta"
 
-#: mail/mail-config-druid.glade.h:65 mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Kokeile asetuksia"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4043,11 +4249,11 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4056,731 +4262,547 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "LisДД lДhde"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Muokkaa lДhdettД"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "LisДД uutispalvelin"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Muokkaa uutispalvelinta"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Kokeillaan: \"%s\""
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Koeyhteys epДonnistui: \"%s\""
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "YhdistДminen onnistui!"
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#.
-#. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7
-msgid "Account Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:8
-msgid "Account Management"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-msgid "Accounts"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:11
-msgid "Add Optional Fields..."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:12
-msgid "Additional Identity Fields"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Authentication"
-msgstr "Todentaminen"
-
-#: mail/mail-config-druid.glade.h:15
-msgid "Browse..."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:16
-msgid "Congratulations, your mail configuration is complete."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:22
-msgid "Default"
-msgstr "Oletus"
-
-#: mail/mail-config-druid.glade.h:25
-msgid "Done"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:27
-msgid "Edit Mail Configuration Settings"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:28
-msgid "Email Address:"
-msgstr "SДhkЖpostiosoite:"
-
-#: mail/mail-config-druid.glade.h:29
-msgid "Evolution Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:30
-msgid "Full Name:"
-msgstr "Koko nimi:"
-
-#: mail/mail-config-druid.glade.h:31
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config-druid.glade.h:32
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:33
-msgid "Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:34
-msgid "Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:35
-msgid "Mail Configuration Druid"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:36
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:38
-msgid "News"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Optional"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Optional Information"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Password:"
-msgstr "Salasana:"
-
-#: mail/mail-config-druid.glade.h:44
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:46
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:48
-msgid ""
-"Please enter your name and email address below. The &quot;optional&quot; "
-"fields below do not "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:50
-msgid "Preferred type: "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:52
-msgid "Receiving Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:53
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Reply-to:"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:55
-msgid "Required"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:56
-msgid "SMTP"
-msgstr "SMTP"
-
-#: mail/mail-config-druid.glade.h:57
-msgid "SMTP server requires authentication"
-msgstr "SMTP-palvelin vaati todennuksen"
-
-#: mail/mail-config-druid.glade.h:58
-msgid "Sending Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:59
-msgid "Sending Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:60
-msgid "Server Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:61
-msgid "Server Type: "
-msgstr "Palvelintyyppi: "
-
-#: mail/mail-config-druid.glade.h:64 mail/mail-config.glade.h:21
-msgid "Sources"
-msgstr "LДhteet"
-
-#: mail/mail-config-druid.glade.h:68
-msgid "Welcome to the Evolution Mail Configuration Druid! "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:74
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:78
-msgid "Your mail server supports the following types of authentication. Please"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Osoite"
 
-#: mail/mail-config.glade.h:11
+#: po/tmp/mail-config.glade.h:10
 msgid "Identities"
 msgstr ""
 
-#: mail/mail-config.glade.h:12
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:13
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config.glade.h:14
+#: po/tmp/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "Merkitse viesti nДhdyksi [ms]: "
 
-#: mail/mail-config.glade.h:15
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Uutispalvelimet"
 
-#: mail/mail-config.glade.h:16
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:17
+#: po/tmp/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organisaatio"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "LДhetД viestit HTML-muodossa"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr ""
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr ""
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr ""
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "LДhteet"
 
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Anna PGP/GPG-salasanasi"
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Ei salasanaa."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP-ohjelmaa ei ole."
 
-#: mail/mail-display.c:67
-msgid "Overwrite file?"
-msgstr ""
-
-#: mail/mail-display.c:71
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-
-#: mail/mail-display.c:85
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-display.c:97
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-display.c:193
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Tallenna liite"
 
-#: mail/mail-display.c:233
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "VДliaikaishakemistoa ei voitu luoda: %s"
 
-#: mail/mail-display.c:275
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr ""
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:303
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Ulkoinen katselin"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr ""
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr ""
 
-#: mail/mail-format.c:823
+#: mail/mail-format.c:845
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:835
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:841
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "Salattu viesti"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1444
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1460
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1494
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1499
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:194
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr ""
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Luodaan uutta kansiota"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopioidaan viestejД"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, 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:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:659
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:661
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:69
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:71
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:366
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:368
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:503
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "LДhetetДДn \"%s\""
 
-#: mail/mail-ops.c:508
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "LДhetetДДn viesti ilman aihetta"
 
-#: mail/mail-ops.c:511
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "LДhetД \"%s\""
 
-#: mail/mail-ops.c:514
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "LДhetД viesti ilman aihetta"
 
-#: mail/mail-ops.c:685
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:687
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:823 mail/mail-ops.c:830
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:827 mail/mail-ops.c:833
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:905
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:966
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "SiirretДДn viestejД \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopioidaan viestejД \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:971
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "SiirrД viestejД kansiosta \"%s\" kansioon \"%s\""
 
-#: mail/mail-ops.c:973
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopioi viestejД kansiosta \"%s\" kansioon \"%s\""
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "SiirretДДn"
 
-#: mail/mail-ops.c:1007
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopioidaan"
 
-#: mail/mail-ops.c:1027
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1106
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1109
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1140
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "SiirretДДn viestejД \"%s\" -> \"%s\""
 
-#: mail/mail-ops.c:1263
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1265
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1334 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(ei kuvausta)"
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1398
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1501
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1509
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1514
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1551
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1568
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1654
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "Salattu viesti"
+
+#: mail/mail-ops.c:1679
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Salattu viesti"
+
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1656
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1758
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1760
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1808
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1854
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkronoidaan \"%s\""
 
-#: mail/mail-ops.c:1856
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronoi \"%s\""
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1929
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2149
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2151
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2218
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2221
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2247
+#: 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 "SiirretДДn viestejД \"%s\" -> \"%s\""
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "SiirrД viestejД kansiosta \"%s\" kansioon \"%s\""
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "SiirretДДn viestejД \"%s\" -> \"%s\""
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: mail/mail-summary.c:95 mail/mail-threads.c:703
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-summary.c:368
-msgid "Mailbox summary"
-msgstr ""
-
 #: mail/mail-threads.c:301
 #, c-format
 msgid ""
@@ -4788,82 +4810,82 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/mail-tools.c:187
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:237
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
 #. Info
-#: mail/mail-tools.c:288
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
 #. Append it to dest
-#: mail/mail-tools.c:301
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:330
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr ""
 
-#: mail/mail-tools.c:367
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:377
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr ""
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:521
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4874,54 +4896,70 @@ msgstr ""
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr ""
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:33
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:38
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:159 ui/evolution-mail.xml.h:19
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr ""
 
-#: mail/mail-view.c:163 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Tulosta valittu viesti"
 
-#: mail/mail-view.c:165 ui/evolution-mail.xml.h:13
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Poista tДmД viesti"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:2045
-msgid "Rebuilding message view"
+#: mail/message-list.c:575
+msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:2047
-msgid "Rebuild message view"
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr ""
+
+#: mail/message-list.c:846
+#, 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
+#, c-format
+msgid "%s, et al."
 msgstr ""
 
-#: mail/message-thread.c:583
-msgid "Threading message list"
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "(tuntematon)"
+
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
 msgstr ""
 
-#: mail/message-thread.c:585
-msgid "Thread message list"
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
 msgstr ""
 
 #: mail/subscribe-dialog.c:139
@@ -4958,38 +4996,38 @@ msgstr ""
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:110 shell/e-setup.c:179
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:114
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:115
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:156
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:160 shell/e-setup.c:220
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:183
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "TДmД nДyttДisi olevan ensimmДinen kerta kun kДytДt Evolutionia."
 
-#: shell/e-setup.c:184
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Paina \"OK\" asentaaksesi Evolutionin kДyttДjДkohtaiset tiedostot kohteeseen"
 
-#: shell/e-setup.c:201
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5000,14 +5038,14 @@ msgstr ""
 "%s\n"
 "Virhe: %s"
 
-#: shell/e-setup.c:216
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:241
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5015,7 +5053,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:253
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5064,45 +5102,40 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr ""
 
-#: shell/e-shell-view.c:1002 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr ""
-
-#: shell/e-shell-view.c:1006
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr ""
 
-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:1157
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5176,64 +5209,65 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage.c:128
+#: 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
+msgid "_View"
+msgstr "_NДytД"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr ""
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Ei nimeД)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Ei virhettД"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Yleinen virhe"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "I/O-virhe"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
-#: ui/evolution-message-composer.xml.h:46 ui/evolution.xml.h:37
-msgid "_View"
-msgstr "_NДytД"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr ""
-
-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5255,7 +5289,7 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5263,1115 +5297,1118 @@ msgstr ""
 "Kiitos\n"
 "The Evolution Team\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr ""
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr ""
 
-#: shell/main.c:166
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobon komponenttijДrjestelmДn alustus epДonnistui"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.xml.h:7
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr ""
 
-#: ui/evolution-addressbook-ldap.xml.h:8
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "T_oiminnot"
 
-#: ui/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Luo uusi kontakti"
 
-#: ui/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Poista kontakti"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Etsi"
 
-#: ui/evolution-addressbook.xml.h:12
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Etsi kontakti"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Uusi"
 
-#: ui/evolution-addressbook.xml.h:15
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Tulosta kontaktit"
 
-#: ui/evolution-addressbook.xml.h:16
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "PysДytД"
 
-#: ui/evolution-addressbook.xml.h:17
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "PysДytД lataaminen"
 
-#: ui/evolution-addressbook.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "NДytД kaikki"
 
-#: ui/evolution-addressbook.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "NДytД kaikki kontaktit"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_New Contact"
-msgstr "_Uusi kontakti"
-
-#: ui/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "_Tulosta kontaktit..."
 
-#: ui/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_Etsi kontakteja"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_TyЖkalut"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:7
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 pДivДД"
 
-#: ui/evolution-calendar.xml.h:8
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Muuta asetuksia"
 
-#: ui/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Kalenteri"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Kalenterin asetukset..."
 
-#: ui/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: ui/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
-#: ui/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "PДivД"
 
-#: ui/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Kuukausi"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "New Ca_lendar"
-msgstr ""
-
-#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Avaa kalenteri"
 
-#: ui/evolution-calendar.xml.h:23
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Tulosta tДmД kalenteri"
 
-#: ui/evolution-calendar.xml.h:26
+#: po/tmp/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "NДytД 1 pДivД"
 
-#: ui/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "NДytД 1 kuukausi"
 
-#: ui/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "NДytД 1 viikko"
 
-#: ui/evolution-calendar.xml.h:30
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "NДytД tyЖviikko"
 
-#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:32
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Viikko"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:34
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Uusi"
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_New appointment..."
-msgstr "_Uusi tapaaminen..."
-
-#: ui/evolution-calendar.xml.h:35
-msgid "_Open"
-msgstr "_Avaa"
-
-#: ui/evolution-calendar.xml.h:36
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Avaa kalenteri"
 
-#: ui/evolution-calendar.xml.h:37
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Tulosta tДmД kalenteri"
 
-#: ui/evolution-calendar.xml.h:38
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "Tallenna kalenteri _nimellД"
 
-#: ui/evolution-contact-editor.xml.h:8
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:9
+#: po/tmp/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "Poista..."
 
-#: ui/evolution-contact-editor.xml.h:10
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Apua"
 
-#: ui/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:82
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:13 ui/evolution-event-editor.xml.h:83
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Tulosta..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:90
-#: ui/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Tallenna _nimellД..."
 
-#: ui/evolution-contact-editor.xml.h:15 ui/evolution-event-editor.xml.h:91
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Tallenna ja sulje"
 
-#: ui/evolution-contact-editor.xml.h:16
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Tallenna kontakti ja sulje ikkuna"
 
-#: ui/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:99
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:19
+#: po/tmp/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "LДhetД _viesti kontaktille..."
 
-#: ui/evolution-contact-editor.xml.h:20 ui/evolution-event-editor.xml.h:111
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:17
-#: ui/evolution.xml.h:28
+#: 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
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: ui/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "T_ulosta..."
 
-#: ui/evolution-contact-editor.xml.h:22 ui/evolution-event-editor.xml.h:122
-#: ui/evolution-message-composer.xml.h:45
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Tallenna"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Tietoja..."
 
-#: ui/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "T_oiminnot"
 
-#: ui/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "L_eikkaa"
 
-#: ui/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:15
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Sulje tДmД tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopioi"
 
-#: ui/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Kopioi valinta"
 
-#: ui/evolution-event-editor.xml.h:18
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: ui/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Leikkaa valinta"
 
-#: ui/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ui/evolution-event-editor.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:32
+#: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "Apua"
 
-#: ui/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "Tulostuksen _esikatselu"
 
-#: ui/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "_LДhetД"
 
-#: ui/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "Tallenna L_iitteet..."
 
-#: ui/evolution-event-editor.xml.h:45
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:46
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "_Kontakti"
 
-#: ui/evolution-event-editor.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "_Tiedosto..."
 
-#: ui/evolution-event-editor.xml.h:50
+#: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "_Kirjasin..."
 
-#: ui/evolution-event-editor.xml.h:51
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:52
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "_SiirrД kansioon..."
 
-#: ui/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "_Uusi tapaaminen"
 
-#: ui/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:62
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:67 ui/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Etsi uudelleen"
 
-#: ui/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Etsi uude_lleen"
 
-#: ui/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Siirry seuraavaan kohtaan"
 
-#: ui/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Siirry edelliseen kohtaan"
 
-#: ui/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "_Seuraava"
 
-#: ui/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "LiitД"
 
-#: ui/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "LiitД leikepЖytД"
 
-#: ui/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Edellinen"
 
-#: ui/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Edellinen"
 
-#: ui/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Tulost_usasetukset"
 
-#: ui/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
-#: ui/evolution-event-editor.xml.h:84
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:85
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: ui/evolution-event-editor.xml.h:86
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Tee kumottu toiminto uudelleen"
 
-#: ui/evolution-event-editor.xml.h:87
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Korvaa"
 
-#: ui/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "Korvaa merkkijono"
 
-#: ui/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Tallenna tapaaminen ja sulje tapaamisikkuna"
 
-#: ui/evolution-event-editor.xml.h:93 ui/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Tallenna nykyinen tiedosto"
 
-#: ui/evolution-event-editor.xml.h:94
+#: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:96
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:97
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Etsi uudelleen samaa merkkijonoa"
 
-#: ui/evolution-event-editor.xml.h:98
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Etsi merkkijonoa"
 
-#: ui/evolution-event-editor.xml.h:100
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: ui/evolution-event-editor.xml.h:101
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Merkitsee kaikki valituksi"
 
-#: ui/evolution-event-editor.xml.h:102
+#: po/tmp/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr "Muuta nykyisen tulostimesi sivuasetuksia"
 
-#: ui/evolution-event-editor.xml.h:103
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Kumoa"
 
-#: ui/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Kumoa edellinen toiminto"
 
-#: ui/evolution-event-editor.xml.h:105 ui/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "_Tietoja..."
 
-#: ui/evolution-event-editor.xml.h:106 ui/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "_Sulje"
 
-#: ui/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: ui/evolution-event-editor.xml.h:108 ui/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:110 ui/evolution-message-composer.xml.h:40
-#: ui/evolution-subscribe.xml.h:16 ui/evolution.xml.h:27
+#: 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
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ui/evolution-event-editor.xml.h:112
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Etsi..."
 
-#: ui/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:114 ui/evolution-message-composer.xml.h:42
-#: ui/evolution.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Apua"
 
-#: ui/evolution-event-editor.xml.h:115
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "Li_sДД"
 
-#: ui/evolution-event-editor.xml.h:116
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:117
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "L_iitД"
 
-#: ui/evolution-event-editor.xml.h:118
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: ui/evolution-event-editor.xml.h:119
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:120
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Korvaa..."
 
-#: ui/evolution-event-editor.xml.h:123
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_TyЖkalupalkit"
 
-#: ui/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:7
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:8
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:10
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:14 ui/evolution-subscribe.xml.h:9
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:16
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:17
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:20
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:21
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+msgid "Mail _Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:22
-msgid "Manage Subscriptions..."
-msgstr ""
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Kuvaus:"
 
-#: ui/evolution-mail.xml.h:23
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:24
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Merkitse _lukemattomaksi"
 
-#: ui/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "SiirrД"
 
-#: ui/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Esikatsele tulostettavaa viestiД"
 
-#: ui/evolution-mail.xml.h:29
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Viestin tulostuksen esikatselu..."
 
-#: ui/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Tulosta viesti..."
 
-#: ui/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Vastaa _Kaikille"
 
-#: ui/evolution-mail.xml.h:36
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Vastaa _LДhettДjДlle"
 
-#: ui/evolution-mail.xml.h:39 ui/evolution-subscribe.xml.h:13
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ui/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:41
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:43
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:45
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:47
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: ui/evolution-mail.xml.h:48
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "_Muokkaa viestiД"
 
-#: ui/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:52 ui/evolution-subscribe.xml.h:18
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:53
-msgid "_Mail Configuration..."
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:54
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_Viesti"
 
-#: ui/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Move to Folder..."
 msgstr "_SiirrД kansioon..."
 
-#: ui/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "_Tulosta viesti"
 
-#: ui/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Tallenna nimellД..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "LДhde"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: ui/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:61
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-message-composer.xml.h:7
+#: po/tmp/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "LiitД"
 
-#: ui/evolution-message-composer.xml.h:9
-msgid "Bold"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Sulje nykyinen tiedosto"
 
-#: ui/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "Insert a file as text into the message"
 msgstr "LiitД tiedosto viestiin tekstinД"
 
-#: ui/evolution-message-composer.xml.h:15
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "LiitД tekstitiedosto..."
 
-#: ui/evolution-message-composer.xml.h:17
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "Avaa tiedosto"
 
-#: ui/evolution-message-composer.xml.h:19
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Tallenna nimellД..."
 
-#: ui/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "Tallenna _kansioon..."
 
-#: ui/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Tallenna kansioon..."
 
-#: ui/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Tallenna tiedosto uudella nimellД"
 
-#: ui/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Tallenna viesti johonkin tiettyyn kansioon"
 
-#: ui/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "LДhetД"
 
-#: ui/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "LДhetД _myЖhemmin"
 
-#: ui/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "LДhetД _myЖhemmin"
 
-#: ui/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "LДhetД viesti HTML-muodossa"
 
-#: ui/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "LДhetД viesti myЖhemmin"
 
-#: ui/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "LДhetД viesti heti"
 
-#: ui/evolution-message-composer.xml.h:32
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "LДhetД viesti heti"
 
-#: ui/evolution-message-composer.xml.h:33
-msgid "Sets something as bold"
-msgstr ""
-
-#: ui/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "NДytД / piilota liitetiedostot"
 
-#: ui/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "NДytД _liitteet"
 
-#: ui/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "NДytД liitteet"
 
-#: ui/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "_LiitД tekstitiedosto..."
 
-#: ui/evolution-message-composer.xml.h:44
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "_Avaa..."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:7
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:10
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:11
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:14
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Tilaa"
 
-#: ui/evolution-subscribe.xml.h:15
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Poista tilaus"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:7
-msgid "Create a new folder"
-msgstr ""
-
-#: ui/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr ""
 
-#: ui/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Poistu"
 
-#: ui/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr ""
 
-#: ui/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr ""
 
-#: ui/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr ""
 
-#: ui/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr ""
 
-#: ui/evolution.xml.h:16
+#: po/tmp/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr ""
 
-#: ui/evolution.xml.h:17
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr ""
 
-#: ui/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr ""
 
-#: ui/evolution.xml.h:24
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Tapaaminen"
 
-#: ui/evolution.xml.h:25
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakti"
 
-#: ui/evolution.xml.h:26
-msgid "_Create New Folder..."
-msgstr "_Luo uusi kansio..."
-
-#: ui/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Kansio"
 
-#: ui/evolution.xml.h:30
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Siirry kansioon..."
 
-#: ui/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr ""
 
-#: ui/evolution.xml.h:33
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr ""
 
-#: ui/evolution.xml.h:35
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Asetukset"
 
-#: ui/evolution.xml.h:36
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr ""
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr ""
@@ -6448,13 +6485,6 @@ msgstr ""
 msgid "All Attendees"
 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:2468
-msgid "%A, %B %d, %Y"
-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
 msgid "%B %Y"
@@ -6464,25 +6494,71 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "Nyt"
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr ""
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 msgid "%I:%M %p"
 msgstr ""
 
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "Nyt"
-
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "RyhmД %i"
+
+#~ msgid "Summary:"
+#~ msgstr "Yhteenveto:"
+
+#~ msgid "Preferences"
+#~ msgstr "Asetukset"
+
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr "Evolutionin sДhkЖpostin yhteenvetokomponentin alustus epДonnistui."
+
+#~ msgid "Authentication"
+#~ msgstr "Todentaminen"
+
+#~ msgid "Default"
+#~ msgstr "Oletus"
+
+#~ msgid "Email Address:"
+#~ msgstr "SДhkЖpostiosoite:"
+
+#~ msgid "Full Name:"
+#~ msgstr "Koko nimi:"
+
+#~ msgid "IMAP"
+#~ msgstr "IMAP"
+
+#~ msgid "Password:"
+#~ msgstr "Salasana:"
+
+#~ msgid "SMTP"
+#~ msgstr "SMTP"
+
+#~ msgid "SMTP server requires authentication"
+#~ msgstr "SMTP-palvelin vaati todennuksen"
+
+#~ msgid "Server Type: "
+#~ msgstr "Palvelintyyppi: "
+
+#~ msgid "_New Contact"
+#~ msgstr "_Uusi kontakti"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Uusi tapaaminen..."
+
+#~ msgid "_Open"
+#~ msgstr "_Avaa"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "_Luo uusi kansio..."
diff --git a/po/fr.po b/po/fr.po
index 37d5e979f0..fe028e9b6c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.5.1\n"
-"POT-Creation-Date: 2000-10-26 22:21+0200\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-10-26 22:15+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <christophe@merlet.net>\n"
 "Language-Team: GNOME French Team <gnomefr@gnomefr.traduc.org>\n"
@@ -15,14 +15,245 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/e-card.c:3046
+#, fuzzy
+msgid "Card: "
+msgstr "Voiture"
+
+#: addressbook/backend/ebook/e-card.c:3048
+#, fuzzy
+msgid ""
+"\n"
+"Name: "
+msgstr "Nom : "
+
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3053
+#, fuzzy
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr "_Suffixe : "
+
+#: addressbook/backend/ebook/e-card.c:3067
+#, fuzzy
+msgid ""
+"\n"
+"Birth Date: "
+msgstr "Date de _DИbut : "
+
+#: addressbook/backend/ebook/e-card.c:3078
+#, fuzzy
+msgid ""
+"\n"
+"Address:"
+msgstr "_Adresse : "
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3086
+#, fuzzy
+msgid ""
+"\n"
+"  Country:     "
+msgstr "Pa_ys : "
+
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3138
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr "E-mail 2"
+
+#: addressbook/backend/ebook/e-card.c:3141
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:"
+msgstr "E-mail 2"
+
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3178
+#, fuzzy
+msgid ""
+"\n"
+"Business Role: "
+msgstr "Travail 2"
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3191
+#, fuzzy
+msgid ""
+"\n"
+"  Name:  "
+msgstr "Nom : "
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3199
+#, fuzzy
+msgid ""
+"\n"
+"Categories: "
+msgstr "catИgories"
+
+#: addressbook/backend/ebook/e-card.c:3200
+#, fuzzy
+msgid ""
+"\n"
+"Comment: "
+msgstr "Commentaires de l'ElИment :"
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3216
+#, fuzzy
+msgid ""
+"\n"
+"Public Key: "
+msgstr "Public"
+
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: 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:1064
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1053
-#: calendar/conduits/todo/todo-conduit.c:934 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Ne peut initialiser Bonobo"
 
@@ -145,25 +376,28 @@ msgstr ""
 "Une erreur est survenue durant la rИcupИration de\n"
 "la liste des pilots depuis le dИmon gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:194
-#: addressbook/conduit/address-conduit.c:208
-msgid "BLARG\n"
-msgstr "BLARG\n"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:210
+msgid "EBook not loaded\n"
+msgstr ""
 
-#: addressbook/conduit/address-conduit.c:638
-#: calendar/conduits/calendar/calendar-conduit.c:615
-#: calendar/conduits/todo/todo-conduit.c:495
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Ne peut dИmarrer le serveur wombat"
 
-#: addressbook/conduit/address-conduit.c:639
-#: calendar/conduits/calendar/calendar-conduit.c:616
-#: calendar/conduits/todo/todo-conduit.c:496
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Ne peut dИmarrer wombat"
 
-#: addressbook/conduit/address-conduit.c:665
-#: addressbook/conduit/address-conduit.c:668
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "Ne peut lire le bloc d'application Adresse du pilot"
 
@@ -184,113 +418,11 @@ msgstr "иlement(s) appartenant Ю ces catИgories : "
 msgid "Available Categories:"
 msgstr "CatИgories Disponibles : "
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr "Assistant"
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr "Travail"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr "Travail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr "Fax Travail"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr "RИpondeur"
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr "Voiture"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr "SociИtИ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr "Maison"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr "Maison 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr "Fax Maison"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr "RNIS"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr "Mobile"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "Autre"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr "Fax Autre"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr "Principal"
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr "E-mail Principale"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-msgstr "E-mail 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"йtes-vous sur de vouloir\n"
-"supprimer ce contact ?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Supprimer le Contact ?"
 
@@ -304,7 +436,7 @@ msgid "_Add"
 msgstr "_Ajouter"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-mail.h:48
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Supprimer"
 
@@ -317,11 +449,13 @@ msgstr "Types de TИlИphone"
 msgid "New phone type"
 msgstr "Nouveau type de tИlИphone"
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:90 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Ajouter"
 
@@ -361,6 +495,11 @@ msgstr "_Fax Travail"
 msgid "_Mobile"
 msgstr "_Mobile"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "E-mail Principale"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "T_ravail"
@@ -374,7 +513,7 @@ msgid "C_ontacts..."
 msgstr "C_ontacts..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tИgories..."
 
@@ -391,7 +530,7 @@ msgid "_Address..."
 msgstr "_Adresse..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "GИnИral"
 
@@ -436,59 +575,146 @@ msgid "No_tes:"
 msgstr "No_tes : "
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "DИtails"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Assistant"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Travail"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Travail 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Fax Travail"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "RИpondeur"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Voiture"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "SociИtИ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Maison"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Maison 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Fax Maison"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "RNIS"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+msgid "Mobile"
+msgstr "Mobile"
+
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
+msgid "Other"
+msgstr "Autre"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Fax Autre"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Principal"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E-mail 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "Adresse _2 : "
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Canada"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Verifier l'Adresse"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Pa_ys : "
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Finlande"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "USA"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adresse : "
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Ville : "
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "BoНte _Postale : "
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "Adresse _2 : "
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "иtat/_Province : "
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Canada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Finlande"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Code Postal : "
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "Pa_ys : "
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -548,26 +774,25 @@ msgstr "_Nom : "
 msgid "_Suffix:"
 msgstr "_Suffixe : "
 
-#: addressbook/gui/component/addressbook.c:310
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Comme _Minicartes"
 
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:9
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Comme _Tableau"
 
-#: addressbook/gui/component/addressbook.c:444
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Impossible d'ouvrir le carnet d'adresses"
 
-#: addressbook/gui/component/addressbook.c:449
+#: addressbook/gui/component/addressbook.c:391
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -576,7 +801,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Il nous est impossible d'ouvrir ce carnet d'adresses. Soit\n"
 "parce que vous avez entrez une URI incorrecte, soit\n"
@@ -587,7 +812,31 @@ msgstr ""
 "vous devriez tИlИcharger et installer OpenLDAP, \n"
 "recompiler et installer Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:584
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#, fuzzy
+msgid "Show All"
+msgstr "Afficher"
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+msgid "Advanced..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "Le corps contient"
+
+#: addressbook/gui/component/addressbook.c:534
+#, fuzzy
+msgid "Name contains"
+msgstr "contient"
+
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "contient"
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "L'URI que le Navigateur de Dossier affichera"
 
@@ -596,172 +845,169 @@ msgid "External Directories"
 msgstr "Annuaires Externes"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Description : "
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "Serveur LDAP : "
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "Nom : "
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "NumИro de Port : "
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr "Racine DN : "
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-msgstr "Nom : "
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "SИlectionnez des Noms"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Rechercher..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "Destinataires du Message"
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "SИlectionnez des Noms"
+
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "SИlectionnez un nom depuis la Liste : "
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Destinataires du Message"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Rechercher"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "fenЙtre2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Enregistrer comme VCard"
 
@@ -783,198 +1029,187 @@ msgstr ""
 "\n"
 "Double-cliquez ici pour crИer un nouveau Contact."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:494
-msgid "Search"
-msgstr "Rechercher"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Mise en Page : "
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Nom du style : "
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "AperГu : "
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Options"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "Inclure : "
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "Formulaires blancs Ю la fin : "
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "Sections : "
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Corps"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "Se suivre immИdiatement l'un l'autre"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Bas : "
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "SИlecteurs de lettre sur le cotИ"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Dimensions : "
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "En-tЙtes pour chaque lettre"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Police..."
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "DИmarrer sur une nouvelle page"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "Polices"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "Nombre de colonnes : "
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "Pied de page : "
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "Formulaires blancs Ю la fin : "
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "Polices"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "En-tЙte"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Police..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "En-tЙte/Pied de page"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "En-tЙtes"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "En-tЙtes pour chaque lettre"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Corps"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "Hauteur : "
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr "Se suivre immИdiatement l'un l'autre"
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "Ombrage"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "Inclure : "
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "Imprimer en utilisant un ombrage gris"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Paysage"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Format"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Gauche : "
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Papier"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "SИlecteurs de lettre sur le cotИ"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Type : "
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Marges"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:80
-msgid "label26"
-msgstr "label26"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "Nombre de colonnes : "
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Dimensions : "
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Options"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Largeur : "
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Orientation"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "Hauteur : "
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Page"
+
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "Mise en Page : "
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Papier"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Source de papier : "
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Marges"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "Portrait"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "Haut : "
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "AperГu : "
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Bas : "
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "Imprimer en utilisant un ombrage gris"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Gauche : "
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "Retourner sur les pages paires"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Droite : "
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Page"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "Sections : "
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "Ombrage"
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Taille : "
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Orientation"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Portrait"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "DИmarrer sur une nouvelle page"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Paysage"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Nom du style : "
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "En-tЙte"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Haut : "
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "Pied de page : "
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Type : "
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "Retourner sur les pages paires"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Largeur : "
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "En-tЙte/Pied de page"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "label26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
@@ -987,13 +1222,13 @@ msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 "Utilitaire de configuration pour le conduit 'Calendrier' d'Evolution.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:571
-#: calendar/conduits/todo/todo-conduit.c:451
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Erreur lors de la communication avec le serveur de calendrier"
 
-#: calendar/conduits/calendar/calendar-conduit.c:669
-#: calendar/conduits/calendar/calendar-conduit.c:672
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ne peut lire le bloc d'application Calendrier du pilot"
 
@@ -1005,8 +1240,8 @@ msgstr "Conduit 'ю Faire' d'Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Utilitaire de configuration pour le conduit 'ю Faire' d'Evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:549
-#: calendar/conduits/todo/todo-conduit.c:552
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ne peut lire le bloc d'application 'ю Faire' du pilot"
 
@@ -1050,49 +1285,46 @@ msgstr "иlИments 'Ю faire' qui finissent aujourd'hui : "
 msgid "To-Do item that is overdue:"
 msgstr "иlИments 'Ю faire' en retard : "
 
-#: calendar/gui/calendar-commands.c:386
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Fichier introuvable"
 
-#: calendar/gui/calendar-commands.c:410
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Ouvrir le calendrier"
 
-#: calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Enregistrer le calendrier"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m%d%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Public"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "PrivИ"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Confidentiel"
 
@@ -1124,7 +1356,7 @@ msgstr "Transparent"
 msgid "Opaque"
 msgstr "Opaque"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1136,36 +1368,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
-#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1175,15 +1406,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "La valeur de pourcentage doit Йtre comprise entre 0 et 100 inclus"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioritИ doit Йtre comprise entre 1 et 9 inclus"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "L'URI que le calendrier affichera"
 
@@ -1200,477 +1431,461 @@ msgid "No summary available."
 msgstr "Aucun rИsumИ disponible."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-subscribe.h:10
+#: 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
 msgid "Close"
 msgstr "Fermer"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Sieste"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "иditer le rendez-vous"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Sieste"
+
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "DurИe de la sieste (minutes)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "PrИfИrences du Calendrier"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Semaine de travail"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Mar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Mer"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Jeu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Ven"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Sam"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dim"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "Premier jour de la semaine : "
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Lundi"
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Tuesday"
-msgstr "Mardi"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Wednesday"
-msgstr "Mercredi"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 heures (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Thursday"
-msgstr "Jeudi"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Friday"
-msgstr "Vendredi"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 heures"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Saturday"
-msgstr "Samedi"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Dimanche"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "DИbut de la journИe : "
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr "Expiration des alarmes aprХs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Fin de la journИe : "
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "Alarmes Auditives"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Display options"
-msgstr "Options d'affichage"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr "Biper quand les fenЙtres d'alarme apparaissent."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "Divisions du temps : "
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Calendrier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "Format de date : "
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "PrИfИrences du Calendrier"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
-msgstr "Afficher l'heure de fin des rendez-vous"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Couleurs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: po/tmp/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Compresser les les week ends"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 heures (am/pm)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 heures"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 minutes"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Options du navigateur de date"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
-msgstr "Afficher les numИros de semaine"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Calendrier"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "DИfauts"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
-msgstr "Afficher"
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
+msgstr "Options d'affichage"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
+#: po/tmp/cal-prefs-dialog.glade.h:23
 #, fuzzy
 msgid "Due Date"
 msgstr "Date d'EchИance"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
-#, fuzzy
-msgid "Time Until Due"
-msgstr "DurИe Avant EchИance"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr "Activer la sonnerie pour"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:14
-msgid "Priority"
-msgstr "PrioritИ"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Fin de la journИe : "
+
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "Premier jour de la semaine : "
+
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "Ven"
+
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Vendredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: po/tmp/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr "Mettre en Иvidence"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
-msgstr "иlИments en Retard"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr "иlИments s'Achevant Aujourd'hui"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr "иlИments Expirant Aujourd'hui : "
+
+#: po/tmp/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr "иlИments Non Encore ExpirИs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Couleurs"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "Choisissez une couleur"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr "иlИments Non Encore ExpirИs : "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
-msgstr "иlИments Expirant Aujourd'hui : "
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Lundi"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr "иlИments en Retard"
+
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr "иlИments ExpirИs : "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "TaskPad"
-msgstr "TБchePad"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "Choisissez une couleur"
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "DИfauts"
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "PrioritИ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr "Me rappeler de tous les rendez-vous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
-msgstr "minutes avant leur dИbut."
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr "Alarmes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr "Alarmes Visuelles"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "Sam"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr "Biper quand les fenЙtres d'alarme apparaissent."
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Samedi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
-msgstr "Alarmes Auditives"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr "Afficher"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
-msgstr "Expiration des alarmes aprХs"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr "Afficher l'heure de fin des rendez-vous"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "seconds."
-msgstr "secondes."
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "Afficher les numИros de semaine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr "Activer la sonnerie pour"
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "DИbut de la journИe : "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
-msgstr "Alarmes"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "Dim"
 
-#: calendar/gui/dialogs/task-editor.c:657
-msgid "Edit Task"
-msgstr "иditer la TБche"
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Dimanche"
 
-#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:285
-msgid "No summary"
-msgstr "Aucun rИsumИ"
+#: po/tmp/cal-prefs-dialog.glade.h:50
+msgid "TaskPad"
+msgstr "TБchePad"
 
-#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:291
-#, c-format
-msgid "Appointment - %s"
-msgstr "Rendez-vous - %s"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "Jeu"
 
-#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:294
-#, c-format
-msgid "Task - %s"
-msgstr "TБche - %s"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Jeudi"
 
-#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:297
-#, c-format
-msgid "Journal entry - %s"
-msgstr "EntrИe de journal - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:53
+#, fuzzy
+msgid "Time Until Due"
+msgstr "DurИe Avant EchИance"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr "Divisions du temps : "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
-msgstr "RИs_umИ"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr "Format de date : "
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
-msgstr "Date de _DИbut : "
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "Mar"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
-msgstr "_Date d'Expiration : "
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Mardi"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "% Comp_lete:"
-msgstr "% Comp_lИtИ : "
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
+msgstr "Alarmes Visuelles"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "_иtat : "
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "Mer"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Non DИmarrИe"
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Mercredi"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "En Cours"
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "Semaine de travail"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
-msgstr "ComplИtИe"
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr "minutes avant leur dИbut."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
+msgstr "secondes."
+
+#.
+#. * 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
+msgid "% Comp_lete:"
+msgstr "% Comp_lИtИ : "
+
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "C_lassification : "
+
+#: po/tmp/task-editor-dialog.glade.h:9
 msgid "Cancelled"
 msgstr "AnnulИe"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "_PrioritИ : "
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
+msgstr "ComplИtИe"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "Date d'AchХvement : "
+
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Haute"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Normal"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "En Cours"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Basse"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "C_lassification : "
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:989
-#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
-#: widgets/misc/e-dateedit.c:1171
+#. 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
 msgid "None"
 msgstr "Aucune"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Contacts..."
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Normal"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Non DИmarrИe"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr "RИs_umИ"
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr "Date de _DИbut : "
+
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "TБche"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "Date d'AchХvement : "
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL : "
 
-#: calendar/gui/e-calendar-table.c:294
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "_Contacts..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr "_Date d'Expiration : "
+
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "_PrioritИ : "
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "_иtat : "
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr "task-editor-dialog"
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "иditer la TБche"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Aucun rИsumИ"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Rendez-vous - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "TБche - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "EntrИe de journal - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Ouvrir la tБche"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Marquer Comme TerminИe"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Marque la tБche comme complИtИe"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:92 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:7
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:163
-#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-mail.h:13
+#: 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 "Supprimer"
 
-#: calendar/gui/e-calendar-table.c:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Supprimer la tБche"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i divisions de 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:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: 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
 msgid "New appointment..."
 msgstr "Nouveau rendez-vous..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "иditer ce rendez-vous..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Supprimer ce rendez-vous"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Rendre ce rendez-vous dИplaГable"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Supprimer cette occurence"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Supprimer toutes les occurences"
 
@@ -1681,250 +1896,221 @@ msgstr "Supprimer toutes les occurences"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:279
-msgid "Edit Appointment"
-msgstr "иditer le Rendez-vous"
-
-#: calendar/gui/event-editor.c:1749 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#. todo
-#.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
-#. get the apply button to work right
 #.
-#. make the properties stuff unglobal
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:6
+msgid "A_ll day event"
+msgstr "_Toute la journИe"
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
-msgstr "RИs_umИ : "
+#: po/tmp/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "Rendez-vous : "
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "Horaire"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "Classification"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Start time:"
-msgstr "Heure de dИbut : "
+#: po/tmp/event-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "RИcurrence"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "End time:"
-msgstr "Heure de fin : "
+#: po/tmp/event-editor-dialog.glade.h:11
+#, fuzzy
+msgid "Days"
+msgstr "Jour"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
-msgstr "_Toute la journИe"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Tou(te)s les"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Classification"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Exceptions"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "Pu_blic"
+#: po/tmp/event-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Hours"
+msgstr "heures"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Pri_vИ"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Cou_rrier Ю : "
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
-msgstr "_Confidentiel"
+#: po/tmp/event-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Minutes"
+msgstr "minutes"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
-msgstr ""
-"Minutes\n"
-"Heures\n"
-"Jours\n"
+#: po/tmp/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Modify"
+msgstr "Lundi"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Display"
-msgstr "_Affichage"
+#: po/tmp/event-editor-dialog.glade.h:20
+#, fuzzy
+msgid "No recurrence"
+msgstr "RИcurrence"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "_Audio"
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "AperГu : "
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Program"
-msgstr "_Programme"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Pri_vИ"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Mail"
-msgstr "_Courrier"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "Pu_blic"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Mail _to:"
-msgstr "Cou_rrier Ю : "
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "RИcurrence"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "_Run program:"
-msgstr "_Lancer le programme : "
+#: po/tmp/event-editor-dialog.glade.h:25
+#, fuzzy
+msgid "Recurrence Rule"
+msgstr "RХgle rИcurrente"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: po/tmp/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Alarme"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "Recurrence rule"
-msgstr "RХgle rИcurrente"
+#: po/tmp/event-editor-dialog.glade.h:27
+#, fuzzy
+msgid "Simple recurrence"
+msgstr "RИcurrence"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Daily"
-msgstr "JournaliХre"
+#: po/tmp/event-editor-dialog.glade.h:28
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "RИsumИ : "
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Weekly"
-msgstr "Hebdomadaire"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Horaire"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Monthly"
-msgstr "Mensuelle"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "_Audio"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Yearly"
-msgstr "Annuelle"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "_Confidentiel"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "label23"
-msgstr "label23"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr "_Affichage"
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-#: calendar/gui/event-editor-dialog.glade.h:51
-#: calendar/gui/event-editor-dialog.glade.h:81
-msgid "Every "
-msgstr "Tou(te)s les "
+#: po/tmp/event-editor-dialog.glade.h:33
+#, fuzzy
+msgid "_End time:"
+msgstr "Heure de fin : "
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "day(s)"
-msgstr "jour(s)"
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "_Courrier"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "label24"
-msgstr "label24"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Programme"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "week(s)"
-msgstr "semaine(s)"
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "_Lancer le programme : "
+
+#: po/tmp/event-editor-dialog.glade.h:37
+#, fuzzy
+msgid "_Start time:"
+msgstr "Heure de dИbut : "
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "label25"
-msgstr "label25"
+#: po/tmp/event-editor-dialog.glade.h:38
+#, fuzzy
+msgid "_Starting date:"
+msgstr "Date de _DИbut : "
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Recur on the"
-msgstr "RИcurrence le"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "jour(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "th day of the month"
-msgstr "Хme jour du mois"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "event-editor-dialog"
 
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
-msgstr ""
-"1er\n"
-"2Хme\n"
-"3Хme\n"
-"4Хme\n"
-"5Хme\n"
-
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
-msgstr ""
-"Lundi\n"
-"Mardi\n"
-"Mercredi\n"
-"Jeudi\n"
-"Vendredi\n"
-"Samedi\n"
-"Dimanche\n"
-
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Every"
-msgstr "Tou(te)s les"
+#: po/tmp/event-editor-dialog.glade.h:41
+#, fuzzy
+msgid "for"
+msgstr "quatriХme"
+
+#: po/tmp/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "forever"
+msgstr "RИpИter indИfiniment"
+
+#: po/tmp/event-editor-dialog.glade.h:43
+#, fuzzy
+msgid "label21"
+msgstr "label26"
 
-#: calendar/gui/event-editor-dialog.glade.h:79
+#: po/tmp/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "mois"
 
-#: calendar/gui/event-editor-dialog.glade.h:82
+#: po/tmp/event-editor-dialog.glade.h:45
+#, fuzzy
+msgid "until"
+msgstr "SansTitre"
+
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
+msgstr "semaine(s)"
+
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "annИe(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "label27"
-msgstr "label27"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "иditer le Rendez-vous"
 
-#: calendar/gui/event-editor-dialog.glade.h:84
-msgid "Ending date"
-msgstr "Date de fin"
+#: calendar/gui/event-editor.c:407
+#, fuzzy
+msgid "on"
+msgstr "Lun"
 
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Repeat forever"
-msgstr "RИpИter indИfiniment"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "jour"
 
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "End on "
-msgstr "Fin le "
+#: calendar/gui/event-editor.c:559
+#, fuzzy
+msgid "on the"
+msgstr "mois"
 
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "End after"
-msgstr "Fin aprИs"
+#: calendar/gui/event-editor.c:566
+#, fuzzy
+msgid "th"
+msgstr "4Хme"
 
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "occurrence(s)"
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
 msgstr "occurence(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "Exceptions"
-msgstr "Exceptions"
-
-#: calendar/gui/event-editor-dialog.glade.h:91
-msgid "Change"
-msgstr "Changer"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "Recurrence"
-msgstr "RИcurrence"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2022,11 +2208,11 @@ msgstr "vendredi"
 msgid "saturday"
 msgstr "samedi"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "an"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "mois"
 
@@ -2034,19 +2220,15 @@ msgstr "mois"
 msgid "fortnight"
 msgstr "quinzaine"
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "semaine"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr "jour"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "heure"
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "minute"
 
@@ -2054,7 +2236,7 @@ msgstr "minute"
 msgid "min"
 msgstr "min"
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "seconde"
 
@@ -2074,8 +2256,8 @@ msgstr "hier"
 msgid "today"
 msgstr "aujourd'hui"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "maintenant"
 
@@ -2140,53 +2322,29 @@ msgstr "douziХme"
 msgid "ago"
 msgstr "passИ"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "CrИer un ИlИment 'Ю faire'"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "иditer l'ИlИment 'Ю faire'"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "RИsumИ : "
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "Date d'ИchИance : "
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "PrioritИ : "
-
-#: calendar/gui/gncal-todo.c:219
-#, fuzzy
-msgid "Item Comments:"
-msgstr "Commentaires de l'ElИment :"
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: 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 "Rappel de votre rendez-vous Ю "
 
-#: calendar/gui/gnome-cal.c:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Ne peut charger le calendrier dans `%s'"
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Ne peut crИer un calendrier dans `%s'"
 
-#: calendar/gui/gnome-cal.c:1166
+#: calendar/gui/gnome-cal.c:1174
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "La mИthode requise pour charger `%s' n'est pas supportИe"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Valider"
 
@@ -2401,181 +2559,96 @@ msgstr "AnnИe en cours (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimer le Calendrier"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:822
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "AperГu Avant Impression"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "Affichage de l'heure"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Format de l'heure"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 heures (AM/PM)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 heures"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "Les semaines dИbutent un"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Horaires de travail"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"SИlectionnez les heures de dИbut et de fin que\n"
-"vous voulez afficher dans la vue par jour et par\n"
-"semaine. Les heures en dehors de cet intervalle\n"
-"ne seront pas affichИes par dИfaut."
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "Heure de dИbut : "
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "Heure de fin : "
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "Couleurs pour l'affichage"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "Afficher dans la liste 'ю Faire' : "
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "Options de style de la liste 'ю Faire' : "
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "Mettre en evidence les ИlИments en retard"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "Mettre en Иvidence les ИlИments non encore achevИ"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "Mettre en Иvidence les ИlИments s'achevant aujourd'hui"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "PropriИtИs de la Liste 'ю Faire'"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "Liste 'ю Faire'"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "PrИfИrences"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmes"
+#. 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 "LMMJVSD"
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "PropriИtИs de l'Alarme"
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#, fuzzy
+msgid "SMTWTFS"
+msgstr "LMMJVSD"
 
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "Biper lors de l'affichage des alarmes"
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Ne peut crИer le fichier de verrouillage pour %s : %s"
 
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "Expiration des alarmes audios aprХs"
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"иchИance du dИlai pour obtenir le fichier de verrouillage sur %s. Essayez de "
+"nouveau plus tard."
 
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " secondes"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
 
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "Activer la sonnerie pour"
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
 
-#: camel/camel-movemail.c:96
+#: camel/camel-movemail.c:99
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Ne peut vИrifier le fichier de courrier %s : %s"
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Ne peut crИer le fichier de verrouillage pour %s : %s"
-
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Ne peut ouvrir le fichier de courrier %s : %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Ne peut ouvrir le fichier de courrier temporaire %s : %s"
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Ne peut tester le fichier de verrouillage pour %s : %s"
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"иchИance du dИlai pour obtenir le fichier de verrouillage sur %s. Essayez de "
-"nouveau plus tard."
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Erreur de lecture du fichier de courrier : %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Erreur d'Иcriture du fichier temporaire de courrier : %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "иchec du stockage du courrier dans le fichier temporaire %s : %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Ne peut crИer le tube : %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Ne peut cloner : %s"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "иchec du programme Movemail : %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Erreur inconnue)"
 
@@ -2589,56 +2662,60 @@ msgstr "Ne peut charger %s : %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ne peut charger %s : Aucun code d'initialisation dans le module."
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:182
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveur %s"
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s service pour %s sur %s"
 
-#: camel/camel-remote-store.c:230
+#: camel/camel-remote-store.c:227
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "Ne peut se connecter Ю %s (port %d) : %s"
 
-#: camel/camel-remote-store.c:231 camel/providers/imap/camel-imap-store.c:190
+#: camel/camel-remote-store.c:228
 msgid "(unknown host)"
 msgstr "(hТte inconnu)"
 
-#: camel/camel-service.c:119
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "L'URL '%s' a besoin du composant 'non d'utilisateur'"
 
-#: camel/camel-service.c:128
+#: camel/camel-service.c:129
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "L'URL '%s' a besoin du composant 'hТte'"
 
-#: camel/camel-service.c:137
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "L'URL '%s' a besoin du composant 'chemin'"
 
-#: camel/camel-service.c:516
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr "Aucun hТte %s."
 
-#: camel/camel-service.c:519
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Temporairement impossible de rИsoudre le nom d'hТte %s."
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Aucun fournisseur disponible pour le protocole `%s'"
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2647,51 +2724,68 @@ msgstr ""
 "Ne peut crИer le rИpertoire %s : \n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "La chaНne d'URL `%s' ne contient pas de protocole"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "La chaНne d'URL `%s' contient un protocole invalide"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:154
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Le numИro de port dans l'URL `%s' n'est pas numИrique"
 
-#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-auth.c:127
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "Ne peut crИer le tube : %s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "RИponse innatendue du serveur IMAP : %s"
+
+#: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "RИponse innatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:228
+#: camel/providers/imap/camel-imap-command.c:224
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "иchec de la commande IMAP : %s"
 
-#: camel/providers/imap/camel-imap-command.c:229 shell/e-storage.c:340
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: camel/providers/imap/camel-imap-command.c:370
+#: camel/providers/imap/camel-imap-command.c:271
+#, fuzzy
+msgid "Server response ended too soon."
+msgstr "La rИponse du serveur IMAP ne contient pas l'information %s"
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La rИponse du serveur IMAP ne contient pas l'information %s"
 
-#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "RИponse OK inatendue du serveur IMAP : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:216
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ne peut charger le rИsumИ pour %s"
 
-#: camel/providers/imap/camel-imap-folder.c:578
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Ne peut trouver le corps du message dans la rИponse FETCH."
 
@@ -2703,29 +2797,36 @@ msgstr "IMAPv4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Pour la lecture et le stockage du courrier sur des serveurs IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:161
-#: camel/providers/nntp/camel-nntp-store.c:292
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: 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 "Mot de Passe"
 
-#: camel/providers/imap/camel-imap-store.c:163
+#: camel/providers/imap/camel-imap-store.c:236
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Cette option vous connectera au serveur IMAP en utilisant un mots de passe "
 "en clair."
 
-#: camel/providers/imap/camel-imap-store.c:188
-#, c-format
-msgid "Could not connect to IMAP server on %s."
-msgstr "Ne peut se connecter au serveur IMAP sur %s."
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
+msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:252
+#: camel/providers/imap/camel-imap-store.c:247
+#, fuzzy
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
+msgstr ""
+"Cela vous connectera au serveur POP et utilisera Kerberos 4 pour vous "
+"identifier."
+
+#: camel/providers/imap/camel-imap-store.c:333
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe IMAP pour %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:274
+#: camel/providers/imap/camel-imap-store.c:359
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2736,55 +2837,208 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:479
+#: camel/providers/imap/camel-imap-store.c:539
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ne peut crИer le rИpertoire %s : %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:220
-msgid "Could not create summary"
-msgstr "Ne peut crИer le rИsumИ"
+#: camel/providers/local/camel-local-provider.c:36
+#, fuzzy
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "RИpertoires de courrier au format UNIX MH"
 
-#: camel/providers/mbox/camel-mbox-folder.c:383
-#: camel/providers/mbox/camel-mbox-folder.c:386
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+"Pour stocker le courrier local dans des rИpertoires de courrier au format MH"
+
+#: camel/providers/local/camel-local-provider.c:47
+#, fuzzy
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "Fichiers de courrier au format UNIX mbox"
+
+#: camel/providers/local/camel-local-provider.c:48
+#, fuzzy
+msgid "For storing local mail in standard mbox format"
+msgstr ""
+"Pour stocker le courrier local dans des rИpertoires de courrier au format MH"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+#, fuzzy
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
+"Pour stocker le courrier local dans des rИpertoires de courrier au format MH"
+
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Impossible d'ajouter le message au fichier mbox : %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "`%s' n'est pas un fichier normal."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Ne peut cloner %s :%s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:489
+#: camel/providers/local/camel-local-store.c:186
+#, fuzzy
+msgid "Local folders may not be nested."
+msgstr "Les dossiers mbox ne peuvent Йtre encapsulИs."
+
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Ne peut obtenir le message : %s"
+msgid "Local mail file %s"
+msgstr "Fichier de courrier local %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "Fichiers de courrier au format UNIX mbox"
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Impossible de renommer le dossier `%s' : %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Impossible de supprimer le dossier dans `%s' : %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Impossible de supprimer le dossier dans `%s' : %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "Impossible de concatИner le message au dossier mh : %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: 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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Impossible d'obtenir le message : %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+#, fuzzy
+msgid "No such message"
+msgstr "Aucun hТte %s."
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
 msgstr ""
-"Pour la lecture de courrier dИlivrИ par le systХme local, et pour le "
-"stockage de courrier sur le disque local."
 
-#: camel/providers/mbox/camel-mbox-store.c:121
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Impossible d'ouvrir le fichier `%s' :\n"
+"Ne peut ouvrir le dossier `%s' :\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:128
-#: camel/providers/mh/camel-mh-store.c:122
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Le dossier `%s' n'existe pas."
 
-#: camel/providers/mbox/camel-mbox-store.c:137
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Ne peut crИer le dossier `%s' :\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' n'est pas un rИpertoire."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Impossible de supprimer le dossier dans `%s' : %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "RИpertoire de courrier local %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Ne peut ouvrir la boНte aux lettres temporaire : %s"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, fuzzy, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Impossible d'ajouter le message au fichier 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Impossible d'obtenir le message : %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Impossible d'ouvrir le fichier `%s' :\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2793,14 +3047,14 @@ msgstr ""
 "Ne peut crИer le fichier `%s' :\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:146
-#: camel/providers/mbox/camel-mbox-store.c:180
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' n'est pas un fichier normal."
 
-#: camel/providers/mbox/camel-mbox-store.c:172
-#: camel/providers/mbox/camel-mbox-store.c:208
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2809,152 +3063,90 @@ msgstr ""
 "Ne peut supprimer le dossier `%s' :\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:187
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Le dossier `%s' n'est pas vide. Non supprimИ."
 
-#: camel/providers/mbox/camel-mbox-store.c:225
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Ne peut renommer le dossier %s vers %s : la destination existe"
-
-#: camel/providers/mbox/camel-mbox-store.c:263
-msgid "Mbox folders may not be nested."
-msgstr "Les dossiers mbox ne peuvent Йtre encapsulИs."
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+"Impossible d'ouvrir le dossier : la liste des messages Иtait incomplete."
 
-#: camel/providers/mbox/camel-mbox-store.c:277
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Local mail file %s"
-msgstr "Fichier de courrier local %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:650
-#, c-format
-msgid "Could not open summary %s"
-msgstr "Ne peut ouvrir le rИsumИ %s"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Ne peut cloner %s :%s"
+
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+"Ne peut ouvrir le dossier `%s' :\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:671
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ne peut ouvrir la boНte aux lettres temporaire : %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:715
-msgid "Summary mismatch, aborting sync"
+#: 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
+#, fuzzy
+msgid "Summary and folder mismatch, even after a sync"
 msgstr "Le rИsumИ ne correspond pas, abandon de la synchronisation"
 
-#: camel/providers/mbox/camel-mbox-summary.c:735
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Le rИsumИ ne correspond pas, en-tЙte X-Evolution manquant"
-
-#: camel/providers/mbox/camel-mbox-summary.c:757
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erreur d'Иcriture dans le fichier temporaire : %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:770
-#: camel/providers/mbox/camel-mbox-summary.c:788
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Impossible de copier les donnИes dans le fichier de sortie : %s"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Erreur d'Иcriture dans le fichier temporaire : %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:813
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Impossible de fermer le dossier source %s : %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:822
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Impossible de fermer le dossier temporaire : %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossible de renommer le dossier : %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:842
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erreur inconnue : %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:211
-msgid "Could not load or create summary"
-msgstr "Impossible de charger ou crИer le rИsumИ"
-
-#: camel/providers/mh/camel-mh-folder.c:330
-#: camel/providers/mh/camel-mh-folder.c:333
-#, c-format
-msgid "Cannot append message to mh folder: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Impossible de concatИner le message au dossier mh : %s"
 
-#: camel/providers/mh/camel-mh-folder.c:399
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Impossible d'obtenir le message : %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "RИpertoires de courrier au format UNIX MH"
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-"Pour stocker le courrier local dans des rИpertoires de courrier au format MH"
-
-#: camel/providers/mh/camel-mh-store.c:115
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Ne peut ouvrir le dossier `%s' :\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:130
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Ne peut crИer le dossier `%s' :\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:139
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' n'est pas un rИpertoire."
 
-#: camel/providers/mh/camel-mh-store.c:158
-#: camel/providers/mh/camel-mh-store.c:171
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Impossible de supprimer le dossier dans `%s' : %s"
-
-#: camel/providers/mh/camel-mh-store.c:189
-#: camel/providers/mh/camel-mh-store.c:193
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Impossible de renommer le dossier `%s' : %s"
-
-#: camel/providers/mh/camel-mh-store.c:197
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Impossible de renommer le dossier `%s' : %s existe"
-
-#: camel/providers/mh/camel-mh-store.c:205
-msgid "MH folders may not be nested."
-msgstr "Les dossiers MH ne peuvent Йtre encapsulИs."
-
-#: camel/providers/mh/camel-mh-store.c:217
-#, c-format
-msgid "Local mail directory %s"
-msgstr "RИpertoire de courrier local %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -2972,7 +3164,7 @@ msgstr "иchec d'envoi du nom d'utilisateur au serveur"
 msgid "Server rejected username/password"
 msgstr "Le serveur a rejetИ le nom d'utilisateur / mot de passe"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Message %s non trouvИ."
@@ -2981,13 +3173,13 @@ msgstr "Message %s non trouvИ."
 msgid "Could not get group list from server."
 msgstr "Ne peut obtenir la liste des grouges du serveur."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:93
-#: camel/providers/nntp/camel-nntp-grouplist.c:102
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Inpossible de charger la liste des groupes du serveur pour %s : %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:151
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
@@ -3008,12 +3200,12 @@ msgstr ""
 msgid "Could not open directory for news server: %s"
 msgstr "Ne peut ouvrir le rИpertoire pour le serveur de nouvelles : %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:287
+#: camel/providers/nntp/camel-nntp-store.c:288
 #, c-format
 msgid "USENET News via %s"
 msgstr "Nouvelles USENET via %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:294
+#: camel/providers/nntp/camel-nntp-store.c:295
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -3021,23 +3213,23 @@ msgstr ""
 "Cette option vous identifiera auprИs du serveur NNTP en utilisant un mot de "
 "passe en clair."
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:499
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr "Incapable d'ouvrir ou de crИer un fichier .newsrc pour %s : %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 "Impossible d'ouvrir le dossier : la liste des messages Иtait incomplete."
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr "Aucun message avec l'uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Ne pas rИcupИrer le message du serveur POP %s : %s"
@@ -3055,7 +3247,7 @@ msgstr ""
 "pour rИcupИrer les courriers depuis certains fournisseurs de courriers Web "
 "et de systХmes de courriers propriИtaires."
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:150
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -3063,7 +3255,7 @@ msgstr ""
 "Cette option vous connectera au serveur POP en utilisant un mot de passe en "
 "clair. C'est la seul option supportИ par la plupart des serveurs POP."
 
-#: camel/providers/pop3/camel-pop3-store.c:162
+#: camel/providers/pop3/camel-pop3-store.c:160
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -3073,29 +3265,29 @@ msgstr ""
 "chiffrИ via le protocole APOP. Cela peut ne pas fonctionner pour tous les "
 "utilisateurs mЙme si le serveur prИtend pouvoir le supporter."
 
-#: camel/providers/pop3/camel-pop3-store.c:174
+#: camel/providers/pop3/camel-pop3-store.c:172
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Cela vous connectera au serveur POP et utilisera Kerberos 4 pour vous "
 "identifier."
 
-#: camel/providers/pop3/camel-pop3-store.c:219
+#: camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "Ne peut vous identifier sur le serveur KPOP : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Ne peut se connecter au serveur POP sur %s."
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:389
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr "%sVeuillez entrer le mot de passe POP3 pour %s@%s"
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3104,12 +3296,12 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du nom d'utilisateur : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:411
+#: camel/providers/pop3/camel-pop3-store.c:448
 msgid "(Unknown)"
 msgstr "(Inconnu)"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:438
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3117,7 +3309,7 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Aucun support pour le mИcanisme d'identification demandИ."
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3126,7 +3318,7 @@ msgstr ""
 "Impossible de se connecter au serveur POP.\n"
 "Erreur lors de l'envoi du mot de passe : %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:554
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Aucun dossier `%s'."
@@ -3196,107 +3388,107 @@ msgid "For reading mail as a query of another set of folders"
 msgstr ""
 "Pour la lecture de courrier comme requЙte a un autre ensemble de dossiers"
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 octet"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u octets"
 
-#: composer/e-msg-composer-attachment-bar.c:94
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fko"
 
-#: composer/e-msg-composer-attachment-bar.c:98
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fMo"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fGo"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:299 mail/mail-display.c:118
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "piХce-jointe"
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Joindre un fichier"
 
-#: composer/e-msg-composer-attachment-bar.c:442 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/filter.glade.h:14
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Enlever"
 
-#: composer/e-msg-composer-attachment-bar.c:443
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Supprimer les ИlИments sИlectionnИs de la liste des piХces-jointes"
 
-#: composer/e-msg-composer-attachment-bar.c:474
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Ajouter une piХce-jointe..."
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Joindre un fichier au message"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "PropriИtИs de la piХce-jointe"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "Type MIME : "
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nom du fichier : "
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+#: po/tmp/e-msg-composer-attachment.glade.h:9
+msgid "MIME type:"
+msgstr "Type MIME : "
+
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "De : "
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Cliquez ici pour le carnet d'adresses"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 msgid "Enter the identity you wish to send this message from"
 msgstr "Entrez l'identitИ sous laquelle vous dИsirez envoyer ce message"
 
-#: composer/e-msg-composer-hdrs.c:300
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "ю : "
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Entrez les destinataires du message"
 
-#: composer/e-msg-composer-hdrs.c:305
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc : "
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Entrez les adresses qui recevront une copie carbone de ce message"
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc : "
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3304,15 +3496,15 @@ msgstr ""
 "Entrez les adresses qui recevront une copie carbone du message sans "
 "apparaitre dans la liste des destinataires du messages."
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Sujet : "
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Entrez le sujet du message"
 
-#: composer/e-msg-composer.c:299
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3321,38 +3513,38 @@ msgstr ""
 "Ne peut ouvrir le fichier de signature %s :\n"
 "%s"
 
-#: composer/e-msg-composer.c:406
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: composer/e-msg-composer.c:417
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erreur d'enregistrement du fichier : %s"
 
-#: composer/e-msg-composer.c:437
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erreur de chargement du fichier : %s"
 
-#: composer/e-msg-composer.c:459
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Enregistrement des changements dans le message..."
 
-#: composer/e-msg-composer.c:461
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Enregistrer les changements dans le message..."
 
-#: composer/e-msg-composer.c:502
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Erreur de l'enregistrement de la composition dans 'Brouillons' : %s"
 
-#: composer/e-msg-composer.c:546 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:552
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3362,27 +3554,27 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer vos changements ?"
 
-#: composer/e-msg-composer.c:574
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Ouvrir un fichier"
 
-#: composer/e-msg-composer.c:700
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Ce fichier n'existe pas."
 
-#: composer/e-msg-composer.c:710
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Ce n'est pas un fichier normal."
 
-#: composer/e-msg-composer.c:720
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Ce fichier existe mais n'est pas lisible."
 
-#: composer/e-msg-composer.c:730
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ce fichier apparait accessible mais l'ouverture 'open(2)' a ИchouИ."
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3390,47 +3582,65 @@ msgstr ""
 "Ce fichier est trИs gros (plus de 100 ko).\n"
 "йtes-vous sШr de vouloir l'insИrer ?"
 
-#: composer/e-msg-composer.c:773
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Une erreur est survenue durant la lecture du fichier."
 
-#: composer/e-msg-composer.c:1136
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Composer un message"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Ne peut crИer la fenЙtre de composition."
 
-#: filter/filter-datespec.c:61
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
+
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Rechercher"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "annИes"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "mois"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "semaines"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 msgid "days"
 msgstr "jours"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "heures"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minutes"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "secondes"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -3439,7 +3649,7 @@ msgstr ""
 "La date du message sera comparИ Ю la date d'execution\n"
 "du filtre ou lorsque le dossier virtuel est ouvert."
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -3447,7 +3657,7 @@ msgstr ""
 "La date du message sera comparИ Ю la date\n"
 "que vous spИcifiez ici."
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3458,42 +3668,49 @@ msgstr ""
 "\"il y a une semaine\", par exemple."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr "la date actuelle"
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr "une date que vous spИcifiez"
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr "une date relative Ю la date en cours"
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr "Comparer avec"
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<cliquez ici pour sИlectionner une date>"
 
-#: filter/filter-editor.c:159 mail/mail-autofilter.c:287
-#: mail/mail-autofilter.c:336
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Ajouter une RХgle de Filtre"
 
-#: filter/filter-editor.c:207
+#: filter/filter-editor.c:233
 msgid "Edit Filter Rule"
 msgstr "иditer la RХgle du Filtre"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:404 filter/filter.glade.h:7
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr ""
+"Entrant\n"
+"Sortant\n"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "иditer les Filtres"
 
@@ -3510,81 +3727,104 @@ msgstr "Ajouter l'action"
 msgid "Remove action"
 msgstr "Supprimer l'action"
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "SИlectionnez un Dossier"
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Entrez l'URI du dossier"
 
-#: filter/filter-folder.c:254
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<cliquez ici pour sИlectionner un dossier>"
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:184
+#, fuzzy, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Erreur durant le prИparation vers %s :\n"
+"%s"
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:509
+#: filter/filter-rule.c:520
 msgid "Rule name: "
 msgstr "Nom de la rХgle : "
 
-#: filter/filter-rule.c:513
+#: filter/filter-rule.c:524
 msgid "Untitled"
 msgstr "SansTitre"
 
-#: filter/filter-rule.c:527
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Si"
 
-#: filter/filter-rule.c:544
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "ExИcuter les actions"
 
-#: filter/filter-rule.c:548
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "si tous les critХres sont remplis"
 
-#: filter/filter-rule.c:553
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "si un des critХres est rempli"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Ajouter un critХre"
 
-#: filter/filter-rule.c:570
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Supprimer le critХre"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Entrant\n"
-"Sortant\n"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "RХgles de Filtrage"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "иditer"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "иditer les dossiers virtuels"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "RХgles de Filtrage"
+
+#: po/tmp/filter.glade.h:12
+#, fuzzy
+msgid "Incoming"
+msgstr ""
+"Entrant\n"
+"Sortant\n"
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "Bordure : "
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Dossiers Virtuels"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Sources de Dossier Virtuel"
 
@@ -3622,95 +3862,143 @@ msgid "Message Body"
 msgstr "Corps du message"
 
 #: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Corps du message"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Le message a ИtИ reГu"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Le message a ИtИ envoyИ"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "DИplacer vers le dossier"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Destinataires"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "ExpИditeur"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "_иtat : "
+
+#: filter/libfilter-i18n.h:20
 #, fuzzy
 msgid "Source"
 msgstr "Sources"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "En-tЙte spИcifique"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "_иtat : "
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "ArrЙte le traitement"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Sujet"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "aprИs"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "avant"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "contient"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "ne contient pas"
 
-#: filter/libfilter-i18n.h:25
-msgid "does not match regex"
+#: filter/libfilter-i18n.h:29
+#, fuzzy
+msgid "does not end with"
+msgstr "ne contient pas"
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "does not exist"
+msgstr "Ce fichier n'existe pas."
+
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "does not sound like"
+msgstr "ne contient pas"
+
+#: filter/libfilter-i18n.h:32
+#, fuzzy
+msgid "does not start with"
+msgstr "ne contient pas"
+
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "exists"
+msgstr "suivant"
+
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "est plus que"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "est moins que"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "n'est pas"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "est"
 
-#: filter/libfilter-i18n.h:30
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "sur ou aprИs"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "sur ou avant"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "Иtait aprИs"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "Иtait avant"
 
@@ -3734,79 +4022,164 @@ msgstr "Ajouter une rХgle de dossier virtuel"
 msgid "Edit VFolder Rule"
 msgstr "иditez la rХgle du dossier virtuel"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne peut initialiser le composant de messagerie d'Evolution."
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Ne peut initialiser le hachage du stockage de courrier d'Evolution."
-
-#: mail/component-factory.c:323
-#, c-format
-msgid "Bad storage URL (no server): %s"
-msgstr "Mauvaise URL de stockage (aucun serveur) : %s"
-
-#: mail/component-factory.c:342
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "Ne peut enregistrer le stockage avec le shell"
 
-#: mail/folder-browser.c:137
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
+msgstr "Enregistrer"
+
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "Le corps ou le sujet contient"
 
-#: mail/folder-browser.c:138
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Le corps contient"
 
-#: mail/folder-browser.c:139
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Le sujet contient"
 
-#: mail/folder-browser.c:140
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Le corps ne contient pas"
 
-#: mail/folder-browser.c:141
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Le sujet ne contient pas"
 
-#: mail/folder-browser.c:142
-msgid "Custom search"
-msgstr "Recherche personnel"
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr "Dossier virtuel sur le sujet"
 
-#: mail/folder-browser.c:314
-msgid "Custom"
-msgstr "Personnel"
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr "Dossier virtuel sur l'expИditeur"
+
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr "Dossier virtuel sur les destinataires"
 
-#: mail/folder-browser.c:492
-msgid "Full Search"
-msgstr "Rechercher complХte"
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr "Filtre sur le sujet"
 
-#: mail/folder-browser.c:497
-msgid "Save"
-msgstr "Enregistrer"
+#: mail/folder-browser.c:458
+msgid "Filter on Sender"
+msgstr "Filtre sur l'expИditeur"
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr "Filtre sur les destinataires"
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr "Filtre sur la liste de diffusion"
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "_Ouvrir"
+
+#: mail/folder-browser.c:466
+#, fuzzy
+msgid "Save As..."
+msgstr "Enregistrer sous..."
+
+#: 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
+msgid "Print"
+msgstr "Imprimer"
+
+#: mail/folder-browser.c:469
+msgid "Reply to Sender"
+msgstr "RИpondre Ю l'expИditeur"
+
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
+msgid "Reply to All"
+msgstr "RИpondre Ю tous"
 
-#: mail/mail-autofilter.c:76
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr "Faire suivre"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Avance dans le temps"
+
+#: mail/folder-browser.c:474
+#, fuzzy
+msgid "Mark as Read"
+msgstr "_Marquer comme lus"
+
+#: mail/folder-browser.c:475
+#, fuzzy
+msgid "Mark as Unread"
+msgstr "Marquer comme _non lu"
+
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "DИplacer vers le dossier"
+
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Copier vers le dossier"
+
+#: mail/folder-browser.c:480
+#, fuzzy
+msgid "Undelete"
+msgstr "Supprimer"
+
+#. { _("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
+#, fuzzy
+msgid "Apply Filters"
+msgstr "иditer les Filtres"
+
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Filtre sur la liste de diffusion (%s)"
+
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Courrier Ю %s"
 
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Sujet"
+
 #: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Courrier de %s"
 
-#: mail/mail-autofilter.c:332
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "liste de diffusion %s"
 
-#: mail/mail-callbacks.c:73
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3818,7 +4191,7 @@ msgstr ""
 "recevoir ou composer des courriers.\n"
 "Voulez-vous le configurer maintenant ?"
 
-#: mail/mail-callbacks.c:113
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -3826,7 +4199,7 @@ msgstr ""
 "Vous devez configurer une identitИ\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:127
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -3834,19 +4207,19 @@ msgstr ""
 "Vous devez configurez un transport de messagerie\n"
 "avant de pouvoir composer un message."
 
-#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
 msgid "You have no mail sources configured"
 msgstr "Vous n'avez pas de source de courrier configurИ"
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:213
 msgid "You have not set a mail transport method"
 msgstr "Vous n'avez pas dИfini de mИthode de transport de courrier"
 
-#: mail/mail-callbacks.c:221
+#: mail/mail-callbacks.c:222
 msgid "You have no Outbox configured"
 msgstr "Vous n'avez pas de boНte de sortie configurИ"
 
-#: mail/mail-callbacks.c:245
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3854,15 +4227,19 @@ msgstr ""
 "Ce message n'a pas de sujet.\n"
 "Voulez-vous vraiment l'envoyer ?"
 
-#: mail/mail-callbacks.c:521
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "DИplacez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:523
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Copiez le(s) message(s) vers"
 
-#: mail/mail-callbacks.c:638
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3870,7 +4247,29 @@ msgstr ""
 "Vous ne pouvez Иditer des messages que\n"
 "lorsqu'ils sont dans le dossier Brouillons."
 
-#: mail/mail-callbacks.c:737
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "иcraser le fichier ?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Un fichier avec le mЙme nom existe.\n"
+"L'Иcraser ?"
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Enregistrer sous..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Enregistrer sous..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3879,15 +4278,47 @@ msgstr ""
 "Erreur de chargement des information du filtre :\n"
 "%s"
 
-#: mail/mail-callbacks.c:782 mail/message-list.c:1574
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/mail-callbacks.c:829
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "иchec de l'impression du message"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr "IdentitИ"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "Configuration de la messagerie"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "Source de courrier"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transport de courrier"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"Votre configuration de la messagerie est maintenant complИtИe.\n"
+"Cliquez sur \"Terminer\" pour enregistrer vos nouveaux paramХtres."
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -3897,59 +4328,63 @@ msgstr ""
 "Vous pouvez aussi, optionellement, entrez le nom de votre organisation, et "
 "le nom du fichier dans lequel lire votre signature."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Nom complet :"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Adresse Иlectronique :"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organisation :"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Fichier de signature :"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Fichier de signature"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Serveur :"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Nom d'utilisateur :"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Chemin :"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Identification :"
 
-#: mail/mail-config-gui.c:941
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "DИtecter les types supportИs..."
 
 #: 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 pas effacer les messages du serveur"
 
-#: mail/mail-config-gui.c:980
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Test des rИglages"
 
-#: mail/mail-config-gui.c:1107
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Type de source de courrier :"
 
-#: mail/mail-config-gui.c:1112 mail/mail-config-gui.c:1160
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3964,11 +4399,11 @@ msgstr ""
 "bouton \"DИtecter les types supportИs...\" aprИs avoir entrИ les autres "
 "informations."
 
-#: mail/mail-config-gui.c:1131
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "Type de sources de nouvelles :"
 
-#: mail/mail-config-gui.c:1136
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3983,186 +4418,112 @@ msgstr ""
 "bouton \"DИtecter les types supportИs...\" aprИs avoir entrИ les autres "
 "informations."
 
-#: mail/mail-config-gui.c:1155
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "Type de transport de courrier :"
 
-#: mail/mail-config-gui.c:1210
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Ajouter une identitИ"
 
-#: mail/mail-config-gui.c:1212
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "иditer l'identitИ"
 
-#: mail/mail-config-gui.c:1310
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Ajouter source"
 
-#: mail/mail-config-gui.c:1312
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "иditer source"
 
-#: mail/mail-config-gui.c:1407
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Ajouter un serveur de news"
 
-#: mail/mail-config-gui.c:1409
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "иditer le serveur de news"
 
-#: mail/mail-config-gui.c:2233
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Test de \"%s\""
 
-#: mail/mail-config-gui.c:2235
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Test de connexion Ю \"%s\""
 
-#: mail/mail-config-gui.c:2277
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "La connexion est concluante !"
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Interroge les capacitИs d'autorisation de \"%s\""
 
-#: mail/mail-config-gui.c:2329
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "Interroge l'autorisation Ю \"%s\""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "Configuration de la messagerie"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Bienvenue sur l'assistant de configuration de messagerie d'Evolution !\n"
-"En y remplissant les informations concernant les paramХtres de votre\n"
-"messagerie, vous pourrez commencer Ю envoyer et recevoir des mails.\n"
-"Cliquez sur \"Suivant\" pour continuer."
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "IdentitИ"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Source de courrier"
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "Transport de courrier"
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"Votre configuration de la messagerie est maintenant complИtИe.\n"
-"Cliquez sur \"Terminer\" pour enregistrer vos nouveaux paramХtres."
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr "IdentitИs"
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adresse"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Organisation"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Sources"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr "IdentitИs"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Sources de messages"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
+msgstr "Marque les messages comme vus [ms] : "
+
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Serveur de forums"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Sources de forums"
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "Organisation"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Envoie les messages au format HTML"
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
-msgstr "Marque les messages comme vus [ms] : "
-
-#: mail/mail-crypto.c:137
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Ne peut crИer le tube vers %s : %s"
-
-#: mail/mail-crypto.c:164
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Ne peut exИcuter %s : %s\n"
-
-#: mail/mail-crypto.c:168
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Ne peut cloner %s :%s"
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Sources"
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Entrer votre phrase de passe PGP/GPG."
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Aucun mot de passe fournit."
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Ne peut crИer le tube vers GPG/PGP : %s"
 
-#: mail/mail-crypto.c:600
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Aucun programme GPG/PGP disponible."
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
-msgstr "иcraser le fichier ?"
-
-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Un fichier avec le mЙme nom existe.\n"
-"L'Иcraser ?"
-
-#: mail/mail-display.c:86
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4171,73 +4532,130 @@ msgstr ""
 "Ne peut ouvrir le fichier %s :\n"
 "%s"
 
-#: mail/mail-display.c:98
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ne peut Иcrire les donnИes : %s"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Enregistrer la piХce-jointe"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Ne peut crИer de rИpertoire temporaire : %s"
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Enregistrer sur le disque..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: mail/mail-display.c:280
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "Voir en ligne"
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Visualiseur externe"
 
-#: mail/mail-display.c:327
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Voir en ligne (via %s)"
 
-#: mail/mail-display.c:331
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Cacher"
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:500
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "piХce-jointe"
+
+#: mail/mail-format.c:623
+#, fuzzy
+msgid "Reply-To:"
+msgstr "RИpondre"
+
+#: mail/mail-format.c:845
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+#, fuzzy
+msgid "Encrypted message not displayed"
+msgstr "Nettoyer l'affichage des messages"
+
+#: mail/mail-format.c:863
+#, fuzzy
+msgid "Encrypted message"
+msgstr "иditer le message"
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1486
+#, fuzzy, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Filtre sur la liste de diffusion (%s)"
+
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Changement du dossier \"%s\" vers le format \"%s\""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Change de dossier \"%s\" vers le format \"%s\""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Fermeture du dossier en cours"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Renommage du vieus dossier et ouverture"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "CrИation d'un nouveau dossier"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Copie du message"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4246,7 +4664,7 @@ msgstr ""
 "Ne peut enregistrer les meta-info du dossier; vous n'allez probablement plus "
 "pouvoir ouvrir ce dossier : %s"
 
-#: mail/mail-local.c:443
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4254,275 +4672,308 @@ msgstr ""
 "Si vous ne pouvez plus ouvrir cette boНte aux lettres, alors\n"
 "vous aurez besoin de la rИparer manuellement."
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX non lu)"
+#: mail/mail-local.c:781
+#, fuzzy
+msgid "Registering local folder"
+msgstr "CrИation d'un nouveau dossier"
+
+#: mail/mail-local.c:783
+#, fuzzy
+msgid "Register local folder"
+msgstr "CrИe un nouveau dossier"
 
-#: mail/mail-ops.c:68
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "RИcupИration du courrier depuis %s"
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "RИcupХre le courrier depuis %s"
 
-#: mail/mail-ops.c:110
-#, c-format
-msgid "Retrieving messages : %s"
-msgstr "RИcupИration des messages : %s"
-
-#: mail/mail-ops.c:253
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Il n'y a pas de nouveaux messages sur %s."
 
-#: mail/mail-ops.c:308
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtrage d'e-mail Ю la demande"
 
-#: mail/mail-ops.c:310
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Filtre d'e-mail Ю la demande"
 
-#: mail/mail-ops.c:441
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "ExpИdition de \"%s\""
 
-#: mail/mail-ops.c:446
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "ExpИdition d'un message sans sujet"
 
-#: mail/mail-ops.c:449
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "ExpИdie \"%s\""
 
-#: mail/mail-ops.c:452
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Envoie un message sans sujet"
 
-#: mail/mail-ops.c:623
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "ExpИdition de la queue"
 
-#: mail/mail-ops.c:625
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "ExpИdie la queue"
 
-#: mail/mail-ops.c:761 mail/mail-ops.c:768
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Adjation de \"%s\""
 
-#: mail/mail-ops.c:765 mail/mail-ops.c:771
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "Adjoint un message sans sujet"
 
-#: mail/mail-ops.c:843
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Nettoyage \"%s\""
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Nettoie \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "DИplacement des messages de \"%s\" vers \"%s\""
 
-#: mail/mail-ops.c:906
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Duplication des messages de \"%s\" vers \"%s\""
 
-#: mail/mail-ops.c:909
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "DИplace les messages de \"%s\" vers \"%s\""
 
-#: mail/mail-ops.c:911
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copie les messages de \"%s\" vers \"%s\""
 
-#: mail/mail-ops.c:942
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "DИplacement"
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Duplication"
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s message %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1044
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Marquage des messages du dossier \"%s\""
 
-#: mail/mail-ops.c:1047
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Marque les messages du dossier \"%s\""
 
-#: mail/mail-ops.c:1078
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Marque le message %d du %d"
 
-#: mail/mail-ops.c:1198
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scrutation des dossiers dans \"%s\""
 
-#: mail/mail-ops.c:1201
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Scrute les dossiers dans \"%s\""
 
-#: mail/mail-ops.c:1272 mail/subscribe-dialog.c:194
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Aucune description)"
 
-#: mail/mail-ops.c:1332
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Joints les messages du dossier \"%s\""
 
-#: mail/mail-ops.c:1335
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Joindre les messages de \"%s\""
 
-#: mail/mail-ops.c:1438
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Fait suivre les messages \"%s\""
 
-#: mail/mail-ops.c:1443
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Fait suivre un message sans sujet"
 
-#: mail/mail-ops.c:1446
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Faire suivre le message \"%s\""
 
-#: mail/mail-ops.c:1451
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Faire suivre un message sans sujet"
 
-#: mail/mail-ops.c:1488
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "RИcupИration du message numИro %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1505
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "иchec de gИnИration de la partie MIME du message lors de la gИnИration du "
 "message suivi."
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "Message suivi - %s"
+
+#: mail/mail-ops.c:1679
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "Message suivi - %s"
+
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Chargement de \"%s\""
 
-#: mail/mail-ops.c:1593
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Charge \"%s\""
 
-#: mail/mail-ops.c:1695
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "CrИation de \"%s\""
 
-#: mail/mail-ops.c:1697
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "CrИe \"%s\""
 
-#: mail/mail-ops.c:1745
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr "Exception lors du retour du rИsultat vers le composant shell Иcouteur."
 
-#: mail/mail-ops.c:1791
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synchronisation de \"%s\""
 
-#: mail/mail-ops.c:1793
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synchronise \"%s\""
 
-#: mail/mail-ops.c:1856
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Affichage du message UID \"%s\""
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "Nettoie l'affichage des messages"
 
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Affiche le message UID \"%s\""
 
-#: mail/mail-ops.c:1865
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "Nettoyer l'affichage des messages"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Ouverture des messages du dossier \"%s\""
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Ouvre les messages de \"%s\""
 
-#: mail/mail-ops.c:2081
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Chargement du dossier %s"
 
-#: mail/mail-ops.c:2083
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "Charge le dossier %s"
 
-#: mail/mail-ops.c:2150
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Visualisation des messages du dossier \"%s\""
 
-#: mail/mail-ops.c:2153
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Visualise les messages du dossier \"%s\""
 
-#: mail/mail-ops.c:2179
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "RИcupИration du message %d sur %d (uid \"%s\")"
 
-#: mail/mail-threads.c:299
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Joints les messages du dossier \"%s\""
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Ouverture des messages du dossier \"%s\""
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "RИcupИration du message %d sur %d (uid \"%s\")"
+
+#: mail/mail-search-dialogue.c:104
+#, fuzzy
+msgid "Cancel"
+msgstr "AnnulИe"
+
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+msgid "Incomplete message written on pipe!"
+msgstr "Message incomplИ Иcrit dans le conduit !"
+
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4531,7 +4982,7 @@ msgstr ""
 "Erreur durant le prИparation vers %s :\n"
 "%s"
 
-#: mail/mail-threads.c:648
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4540,38 +4991,34 @@ msgstr ""
 "Erreur durant `%s' :\n"
 "%s"
 
-#: mail/mail-threads.c:701
-msgid "Incomplete message written on pipe!"
-msgstr "Message incomplИ Иcrit dans le conduit !"
-
-#: mail/mail-threads.c:705
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr "Erreur de lecture des commandes de l'enfilade envoyИ."
 
-#: mail/mail-threads.c:770
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "Message corrompu de l'enfilade envoyИe ?"
 
-#: mail/mail-threads.c:889
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Ne peut crИer la boНte de dialogue"
 
-#: mail/mail-threads.c:899
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "L'utilisateur a annulИ la requХte"
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Ne peut crИer de mbox temporaire `%s' : %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:264
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "Examine %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -4580,46 +5027,41 @@ msgstr ""
 "messages dupliquИs."
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "RИcupИration du message %d sur %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "иcriture du message %d du %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Enregistrement des changements vers %s"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (message suivi)"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (pas de sujet)"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Message suivi - %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "Message suivi (pas de sujet)"
 
-#: mail/mail-tools.c:551
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "Ne connait pas le protocole pour ouvrir l'URI `%s'"
-
-#: mail/mail-tools.c:580
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4632,139 +5074,112 @@ msgstr ""
 msgid "VFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:151 ui/evolution-mail.h:34
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "RИpondre"
 
-#: mail/mail-view.c:151 ui/evolution-mail.h:39
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "RИpond Ю l'expИditeur du message"
 
-#: mail/mail-view.c:154 mail/message-list.c:1577 ui/evolution-mail.h:35
-msgid "Reply to All"
-msgstr "RИpondre Ю tous"
-
-#: mail/mail-view.c:154 ui/evolution-mail.h:38
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "RИpond Ю l'expИditeur et Ю tous les destinataires du message"
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:19
-msgid "Forward"
-msgstr "Faire suivre"
-
-#: mail/mail-view.c:157 ui/evolution-mail.h:20
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Fait suivre le message"
 
-#: mail/mail-view.c:161 ui/evolution-addressbook.h:16
-#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
-msgid "Print"
-msgstr "Imprimer"
-
-#: mail/mail-view.c:161 ui/evolution-mail.h:33
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Imprime le message sИlectionnИ"
 
-#: mail/mail-view.c:163 ui/evolution-mail.h:14
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Supprime le message"
 
-#: mail/message-list.c:518
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:521
+#: mail/message-list.c:575
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:524
+#: mail/message-list.c:578
 msgid "Answered"
 msgstr "RИpondu"
 
-#: mail/message-list.c:1572
-msgid "Open in New Window"
-msgstr "Ouvrir dans une nouvelle fenЙtre"
-
-#: mail/message-list.c:1573
-msgid "Edit Message"
-msgstr "иditer le message"
-
-#: mail/message-list.c:1576
-msgid "Reply to Sender"
-msgstr "RИpondre Ю l'expИditeur"
-
-#: mail/message-list.c:1578
-msgid "Forward Message"
-msgstr "Faire suivre le message"
-
-#: mail/message-list.c:1580
-msgid "Delete Message"
-msgstr "Supprimer le message"
-
-#: mail/message-list.c:1581
-msgid "Move Message"
-msgstr "DИplacer le message"
-
-#: mail/message-list.c:1582
-msgid "Copy Message"
-msgstr "Copier le message"
-
-#: mail/message-list.c:1584
-msgid "VFolder on Subject"
-msgstr "Dossier virtuel sur le sujet"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
+msgstr ""
 
-#: mail/message-list.c:1585
-msgid "VFolder on Sender"
-msgstr "Dossier virtuel sur l'expИditeur"
+#. 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
 
-#: mail/message-list.c:1586
-msgid "VFolder on Recipients"
-msgstr "Dossier virtuel sur les destinataires"
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "Inconnu"
 
-#: mail/message-list.c:1588
-msgid "Filter on Subject"
-msgstr "Filtre sur le sujet"
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
+msgstr "Reconstruction de la vue de messages"
 
-#: mail/message-list.c:1589
-msgid "Filter on Sender"
-msgstr "Filtre sur l'expИditeur"
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
+msgstr "Reconstruit la vue de messages"
 
-#: mail/message-list.c:1590
-msgid "Filter on Recipients"
-msgstr "Filtre sur les destinataires"
+#: mail/subscribe-dialog.c:139
+#, fuzzy
+msgid "Display folders starting with:"
+msgstr "Afficher les dossiers contenant :"
 
-#: mail/message-list.c:1591 mail/message-list.c:1614
-msgid "Filter on Mailing List"
-msgstr "Filtre sur la liste de diffusion"
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1616
+#: mail/subscribe-dialog.c:175
 #, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtre sur la liste de diffusion (%s)"
+msgid "Get store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1734
-msgid "Rebuilding message view"
-msgstr "Reconstruction de la vue de messages"
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Scrutation des dossiers dans \"%s\""
 
-#: mail/message-list.c:1736
-msgid "Rebuild message view"
-msgstr "Reconstruit la vue de messages"
+#: mail/subscribe-dialog.c:286
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Ouverture des messages du dossier \"%s\""
 
-#: mail/subscribe-dialog.c:132
-msgid "Display folders containing:"
-msgstr "Afficher les dossiers contenant :"
+#: mail/subscribe-dialog.c:290
+#, fuzzy, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr "Scrute les dossiers dans \"%s\""
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: mail/subscribe-dialog.c:293
+#, fuzzy, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr "Ouverture des messages du dossier \"%s\""
+
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Installation d'Evolution"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -4772,31 +5187,31 @@ msgstr ""
 "Cette nouvelle version d'Evolution a besoin d'installer des fichiers "
 "supplИmentaires dans votre rИpertoire personnel d'Evolution."
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 "Veuillez cliquez sur \"Valider\" pour installer les fichiers, ou \"Annuler\" "
 "pour quitter."
 
-#: shell/e-setup.c:152
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr "Ne peut mettre Ю jour les fichiers correctement"
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Les fichiers d'Evolution sont correctement installИs."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "Il semble que c'est la premiХre fois que vous utilisez Evolution."
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 "Cliquez sur \"Valider\" pour installer les fichiers utilisateur d'Evolution "
 "sous"
 
-#: shell/e-setup.c:197
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4807,7 +5222,7 @@ msgstr ""
 "%s\n"
 "Erreur : %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -4816,7 +5231,7 @@ msgstr ""
 "Ne peut copier les fichiers dans\n"
 "`%s'."
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4827,7 +5242,7 @@ msgstr ""
 "DИplacez le afin de permettre l'installation\n"
 "des fichiers utilisateur d'Evolution."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4883,11 +5298,11 @@ msgstr "Bug buddy n'a pas ИtИ trouvИ dans votre $PATH."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut Йtre exИcutИ."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -4897,37 +5312,37 @@ msgstr ""
 "pour la messagerie, l'agenda, et la gestion de contacts\n"
 "Ю l'intИrieur de l'environnement de bureau Gnome."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Aller au dossier..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Aucun dossier affichИ)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Dossiers"
 
-#: shell/e-shell-view.c:993
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1133
+#: shell/e-shell.c:372
 #, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Ne peut activer l'entrepТt local -- %s"
+
+#: shell/e-shell.c:1208
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Ooops !  La vue pour `%s' est morte de maniХre inattendue.  :-(\n"
 "Cela signifie probablement que le composant %s a plantИ."
 
-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne peut activer l'entrepТt local -- %s"
-
 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
 msgstr "CrИer un nouveau groupe de raccourcis"
@@ -4997,63 +5412,65 @@ msgstr "Supprime ce raccourci de la barre de raccourcis"
 msgid "Error saving shortcuts."
 msgstr "Erreur d'enregistrement des raccourcis."
 
-#: shell/e-storage.c:127
+#: 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
+msgid "_View"
+msgstr "_Vue"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Voir le sИlecteur de dossier"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Pas de nom)"
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Pas d'erreur"
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Erreur gИnИrique"
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Un dossier avec le mЙme nom existe"
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Le type de dossier spИcifiИ n'est pas valide"
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "Erreur d'E/S"
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Pas suffisemment d'espace pour crИer le dossier"
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Le dossier spИcifiИ n'a pas ИtИ trouvИ"
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "La fonction n'est pas implИmentИ dans cet entrepot"
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Permission refusИe"
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "OpИration non supportИe"
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Le type spИcifiИ n'est pas supportИ dans cet entrepot"
 
-#: shell/e-storage-set-view.c:223 ui/evolution.h:39
-msgid "_View"
-msgstr "_Vue"
-
-#: shell/e-storage-set-view.c:223
-msgid "View the selected folder"
-msgstr "Voir le sИlecteur de dossier"
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5096,7 +5513,7 @@ msgstr ""
 "Nous espИrons que vous apprИcierez le rИsultat de notre dur labeur,\n"
 "et nous attendons avec impatience vos contributions !\n"
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5104,582 +5521,1202 @@ msgstr ""
 "Merci\n"
 "L'Иquipe d'Evolution\n"
 
-#: shell/main.c:123
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Ne peut initialiser le shell Evolution."
 
-#: shell/main.c:160
+#: shell/main.c:178
+#, fuzzy
+msgid "Disable."
+msgstr "DИsactivИ"
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne peut initialiser le composant Bonobo"
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "N_ouveau serveur d'annuaire"
 
-#: ui/evolution-addressbook-ldap.h:10
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ui/evolution-addressbook.h:10
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "CrИe une nouveau contact"
 
-#: ui/evolution-addressbook.h:12
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Supprimer le contact"
 
-#: ui/evolution-addressbook.h:13
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Rechercher"
 
-#: ui/evolution-addressbook.h:14
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Rechercher un contact"
 
-#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Nouveau"
 
-#: ui/evolution-addressbook.h:17
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Imprimer les contacts"
 
-#: ui/evolution-addressbook.h:18
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "ArrЙter"
 
-#: ui/evolution-addressbook.h:19
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "ArrЙte le chargement"
 
-#: ui/evolution-addressbook.h:20
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Tout voir"
 
-#: ui/evolution-addressbook.h:21
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Voir tous les contacts"
 
-#: ui/evolution-addressbook.h:22
-msgid "_New Contact"
-msgstr "_Nouveau contact"
-
-#: ui/evolution-addressbook.h:23
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "_Imprimer les contacts..."
 
-#: ui/evolution-addressbook.h:24
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_Rechercher des contacts"
 
-#: ui/evolution-addressbook.h:25
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Outils"
 
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.h:9
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 jours"
 
-#: ui/evolution-calendar.h:10
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Modifier les prИfИrences"
 
-#: ui/evolution-calendar.h:11
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Calendrier"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "PrИfИrences du calendrier..."
 
-#: ui/evolution-calendar.h:12
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "CrИe un nouveau rendez-vous"
 
-#: ui/evolution-calendar.h:13
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "CrИe un nouveau calendrier"
 
-#: ui/evolution-calendar.h:14
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Jour"
 
-#: ui/evolution-calendar.h:15
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Recule dans le temps"
 
-#: ui/evolution-calendar.h:16
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Avance dans le temps"
 
-#: ui/evolution-calendar.h:17
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Aller Ю"
 
-#: ui/evolution-calendar.h:18
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Va Ю une date prИcise"
 
-#: ui/evolution-calendar.h:19
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Va Ю la date actuelle"
 
-#: ui/evolution-calendar.h:20
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mois"
 
-#: ui/evolution-calendar.h:22
-msgid "New Ca_lendar"
-msgstr "Nouveau Ca_lendrier"
-
-#: ui/evolution-calendar.h:23
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Suivant"
 
-#: ui/evolution-calendar.h:24
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Ouvre un calendrier"
 
-#: ui/evolution-calendar.h:25
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "PrИc"
 
-#: ui/evolution-calendar.h:27
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Imprime ce calendrier"
 
-#: ui/evolution-calendar.h:28
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Save calendar as something else"
 msgstr "Enregistrer le calendrier comme quelquechose d'autre"
 
-#: ui/evolution-calendar.h:29
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Affiche une journИe"
 
-#: ui/evolution-calendar.h:30
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Affiche un mois"
 
-#: ui/evolution-calendar.h:31
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Affiche une semaine"
 
-#: ui/evolution-calendar.h:32
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Affiche une semaine de travail"
 
-#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:331
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: ui/evolution-calendar.h:34
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Semaine"
 
-#: ui/evolution-calendar.h:35 ui/evolution.h:35
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Nouveau"
 
-#: ui/evolution-calendar.h:36
-msgid "_New appointment..."
-msgstr "_Nouveau rendez-vous..."
-
-#: ui/evolution-calendar.h:37
-msgid "_Open"
-msgstr "_Ouvrir"
-
-#: ui/evolution-calendar.h:38
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Ouvrir un calendrier"
 
-#: ui/evolution-calendar.h:39
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Imprimer ce calendrier"
 
-#: ui/evolution-calendar.h:40
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "Enregistrer le calendrier _sous"
 
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:19
-#: ui/evolution.h:29
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Supprimer cet ИlИment"
+
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "Supprimer"
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+#, fuzzy
+msgid "Help"
+msgstr "_Aide"
+
+#: po/tmp/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "Imprimer le message..."
+
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
+msgid "Print this item"
+msgstr "Imprime cet ИlИment"
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
+msgid "Print..."
+msgstr "Imprimer..."
+
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
+#, fuzzy
+msgid "Save _As..."
+msgstr "Enregistrer sous..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr "Enregistrer et Quitter"
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
+msgstr "Enregistrer le contact et fermer la boНte de dialogue"
+
+#: po/tmp/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
+msgid "See online help"
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:18
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "Envoie un message sans sujet"
+
+#: 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
 msgid "_File"
 msgstr "_Fichier"
 
-#: ui/evolution-contact-editor.h:10
+#: po/tmp/evolution-contact-editor.xml.h:20
+#, fuzzy
+msgid "_Print..."
+msgstr "Imprimer..."
+
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Enregistrer"
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "Enregistrer _sous"
+#.
+#. * 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
+msgid "About this application"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "About..."
+msgstr "Police..."
+
+#: po/tmp/evolution-event-editor.xml.h:8
+#, fuzzy
+msgid "Actio_ns"
+msgstr "_Actions"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "Calendrier"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "Personnel"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Clear"
+msgstr "Calendrier"
+
+#: po/tmp/evolution-event-editor.xml.h:12
+#, fuzzy
+msgid "Clear the selection"
+msgstr "_Inverser la sИlection"
+
+#: po/tmp/evolution-event-editor.xml.h:14
+#, fuzzy
+msgid "Close this appointment"
+msgstr "Supprimer ce rendez-vous"
+
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+msgid "Copy"
+msgstr "Copier"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:17
+#, fuzzy
+msgid "Cut"
+msgstr "Personnel"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:26
+#, fuzzy
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Copier vers le dossier"
+
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:28
+msgid "FIXME: Define Print _Styles"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:31
+#, fuzzy
+msgid "FIXME: For_ward"
+msgstr "Faire suivre"
+
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:38
+#, fuzzy
+msgid "FIXME: Print Pre_view"
+msgstr "AperГu Avant Impression"
+
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:41
+#, fuzzy
+msgid "FIXME: Rec_urrence..."
+msgstr "RИcurrence"
+
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:43
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "Enregistrer la piХce-jointe"
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:48
+#, fuzzy
+msgid "FIXME: _File..."
+msgstr "_Filtres de message..."
+
+#: po/tmp/evolution-event-editor.xml.h:49
+#, fuzzy
+msgid "FIXME: _Font..."
+msgstr "Police..."
+
+#: po/tmp/evolution-event-editor.xml.h:50
+msgid "FIXME: _Formatting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:52
+#, fuzzy
+msgid "FIXME: _Journal Entry"
+msgstr "EntrИe de journal - %s"
+
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:54
+#, fuzzy
+msgid "FIXME: _Mail Message"
+msgstr "иditer le message"
+
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:56
+#, fuzzy
+msgid "FIXME: _Move to Folder..."
+msgstr "_Aller au dossier"
+
+#: po/tmp/evolution-event-editor.xml.h:57
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "_Nouveau rendez-vous..."
+
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "F_ormat"
+msgstr "Format"
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:70
+#, fuzzy
+msgid "Go to the next item"
+msgstr "Va Ю la date actuelle"
+
+#: po/tmp/evolution-event-editor.xml.h:71
+#, fuzzy
+msgid "Go to the previous item"
+msgstr "Va Ю la date actuelle"
+
+#: po/tmp/evolution-event-editor.xml.h:72
+#, fuzzy
+msgid "Modify the file's properties"
+msgstr "PropriИtИs de la Liste 'ю Faire'"
+
+#: po/tmp/evolution-event-editor.xml.h:73
+#, fuzzy
+msgid "N_ext"
+msgstr "Suivant"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+#, fuzzy
+msgid "Paste"
+msgstr "Page"
+
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:77
+#, fuzzy
+msgid "Pre_vious"
+msgstr "PrИc"
+
+#: po/tmp/evolution-event-editor.xml.h:78
+#, fuzzy
+msgid "Previous"
+msgstr "PrИc"
 
-#: ui/evolution-contact-editor.h:13
+#: po/tmp/evolution-event-editor.xml.h:79
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "Imprimer..."
+
+#: po/tmp/evolution-event-editor.xml.h:80
+#, fuzzy
+msgid "Print Setup"
+msgstr "Mise en Page : "
+
+#: po/tmp/evolution-event-editor.xml.h:83
+#, fuzzy
+msgid "Properties"
+msgstr "PropriИtИs de l'Alarme"
+
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "Radio"
+
+#: po/tmp/evolution-event-editor.xml.h:85
+#, fuzzy
+msgid "Redo the undone action"
+msgstr "Supprimer l'action"
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "RИpondre"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:91
+#, fuzzy
+msgid "Save the appointment and close the dialog box"
+msgstr "Enregistrer le contact et fermer la boНte de dialogue"
+
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
+#, fuzzy
+msgid "Save the current file"
+msgstr "la date actuelle"
+
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+#, fuzzy
+msgid "Search for a string"
+msgstr "_Rechercher des contacts"
+
+#: po/tmp/evolution-event-editor.xml.h:99
+#, fuzzy
+msgid "Select All"
+msgstr "SИlectionnez _tout"
+
+#: po/tmp/evolution-event-editor.xml.h:100
+#, fuzzy
+msgid "Select everything"
+msgstr "SИlectionnez un Dossier"
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "_About..."
+msgstr "ю _propos d'Evolution..."
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "Fermer"
+
+#: po/tmp/evolution-event-editor.xml.h:106
+#, fuzzy
+msgid "_Copy"
+msgstr "Copier"
+
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
+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
+msgid "_Edit"
+msgstr "_иdition"
+
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "Rechercher..."
+
+#: po/tmp/evolution-event-editor.xml.h:112
+#, fuzzy
+msgid "_Forms"
+msgstr "Format"
+
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+msgid "_Help"
+msgstr "_Aide"
+
+#: po/tmp/evolution-event-editor.xml.h:114
+#, fuzzy
+msgid "_Insert"
+msgstr "_Index"
+
+#: po/tmp/evolution-event-editor.xml.h:115
+#, fuzzy
+msgid "_Object"
+msgstr "Sujet"
+
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "_Nom : "
+
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: ui/evolution-contact-editor.h:15
-msgid "Save and Close"
-msgstr "Enregistrer et Quitter"
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "PropriИtИs de l'Alarme"
 
-#: ui/evolution-contact-editor.h:16
-msgid "Save the contact and close the dialog box"
-msgstr "Enregistrer le contact et fermer la boНte de dialogue"
+#: po/tmp/evolution-event-editor.xml.h:119
+#, fuzzy
+msgid "_Redo"
+msgstr "Radio"
 
-#: ui/evolution-contact-editor.h:17
-msgid "Print..."
-msgstr "Imprimer..."
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr ""
 
-#: ui/evolution-contact-editor.h:18
-msgid "Print this item"
-msgstr "Imprime cet ИlИment"
+#: po/tmp/evolution-event-editor.xml.h:122
+#, fuzzy
+msgid "_Toolbars"
+msgstr "_Outils"
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "Supprimer cet ИlИment"
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
+msgstr ""
 
 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.h:9
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Composer"
 
-#: ui/evolution-mail.h:10
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Compose un nouveau message"
 
-#: ui/evolution-mail.h:11
-msgid "Copy"
-msgstr "Copier"
-
-#: ui/evolution-mail.h:12
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Copie le message vers un nouveau dossier"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "D_ossier"
 
-#: ui/evolution-mail.h:16
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltrer sur l'expИditeur"
 
-#: ui/evolution-mail.h:17
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtrer sur les _destinataires"
 
-#: ui/evolution-mail.h:18
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Oublier les _mots de passe"
 
-#: ui/evolution-mail.h:21
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "RИcupИrer"
 
-#: ui/evolution-mail.h:22
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "_Filtres de message..."
 
-#: ui/evolution-mail.h:23
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
 msgstr "GИrer les abopnnements..."
 
-#: ui/evolution-mail.h:24
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "_Marquer comme lus"
 
-#: ui/evolution-mail.h:25
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Marquer comme _non lu"
 
-#: ui/evolution-mail.h:26
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "DИplacer"
 
-#: ui/evolution-mail.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "DИplace le message vers un nouveau dossier"
 
-#: ui/evolution-mail.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Visualise le message a imprimer"
 
-#: ui/evolution-mail.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "AperГu avant impression du message..."
 
-#: ui/evolution-mail.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Imprime le message vers l'imprimante"
 
-#: ui/evolution-mail.h:32
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Imprimer le message..."
 
-#: ui/evolution-mail.h:36
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "RИpondre Ю _tous"
 
-#: ui/evolution-mail.h:37
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "RИpondre Ю l'_expИditeur"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "SИlectionnez _tout"
 
-#: ui/evolution-mail.h:41
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "Envoie les messages en attente et rИcupХre les nouveaux messages"
 
-#: ui/evolution-mail.h:42
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Liste des messages par enfilade"
 
-#: ui/evolution-mail.h:43
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "Dossier Virtuel sur l'e_xpИditeur"
 
-#: ui/evolution-mail.h:44
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "Dossier Virtuel sur les de_stinataires"
 
-#: ui/evolution-mail.h:45
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
 #, fuzzy
 msgid "_Apply Filters"
 msgstr "иditer les Filtres"
 
-#: ui/evolution-mail.h:46
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "_Configuration du dossier..."
 
-#: ui/evolution-mail.h:47
-msgid "_Copy to Folder"
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier"
 
-#: ui/evolution-mail.h:49
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "_иditer le message"
 
-#: ui/evolution-mail.h:50
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "_Nettoyer"
 
-#: ui/evolution-mail.h:51
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "_Filtrer sur le sujet"
 
-#: ui/evolution-mail.h:52
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Inverser la sИlection"
 
-#: ui/evolution-mail.h:54
-msgid "_Mail Configuration..."
-msgstr "Configuration de la _messagerie..."
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "Configuration de la messagerie"
 
-#: ui/evolution-mail.h:55
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_Message"
 
-#: ui/evolution-mail.h:56
-msgid "_Move to Folder"
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
 msgstr "_Aller au dossier"
 
-#: ui/evolution-mail.h:57
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "_Ouvrir dans une nouvelle fenЙtre"
 
-#: ui/evolution-mail.h:58
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "_Imprimer le message"
 
-#: ui/evolution-mail.h:59
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Enregistrer sous..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Sources"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "_Enfiler"
 
-#: ui/evolution-mail.h:60
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Supprimer"
+
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "_Dossier Virtuel sur le sujet"
 
-#: ui/evolution-mail.h:61
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "иditeur de dossier virtuel..."
 
 #.
-#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * 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
+#, fuzzy
+msgid "Attach"
+msgstr "Joindre un fichier"
+
+#: po/tmp/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "Close the current file"
+msgstr "la date actuelle"
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:12
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Joindre un fichier au message"
+
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert text file..."
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "Ouvrir un fichier"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "Enregistrer _sous"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save in _folder... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Aller au dossier..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:23
+#, fuzzy
+msgid "Save the message in a specified folder"
+msgstr "DИplace le message vers un nouveau dossier"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send"
+msgstr "ExpИditeur"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "ExpИditeur"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "ExpИditeur"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "Envoie les messages au format HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Visualise le message a imprimer"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "Envoie les messages au format HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Supprime le message"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Enregistrer la piХce-jointe"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show _attachments"
+msgstr "piХce-jointe"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "piХce-jointe"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "Ouvrir..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.h:9
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Ajouter le dossier Ю votre liste de dossier abonnИs"
 
-#: ui/evolution-subscribe.h:12
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "RafraНchir la liste"
 
-#: ui/evolution-subscribe.h:13
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "RafraНchi la liste de dossiers"
 
-#: ui/evolution-subscribe.h:14
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Supprimer le dossier de votre liste de dossier abonnИs"
 
-#: ui/evolution-subscribe.h:16
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "S'abonner"
 
-#: ui/evolution-subscribe.h:17
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Se dИsabonner"
 
-#: ui/evolution-subscribe.h:18 ui/evolution.h:28
-msgid "_Edit"
-msgstr "_иdition"
-
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.h:9
-msgid "Create a new folder"
-msgstr "CrИe un nouveau dossier"
-
-#: ui/evolution.h:10
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Afficher un dossier diffИrent"
 
-#: ui/evolution.h:11
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Quitter"
 
-#: ui/evolution.h:12
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Barre de _raccourcis d'Evolution"
 
-#: ui/evolution.h:13
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Quitte le programme"
 
-#: ui/evolution.h:14
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "PrЙt Ю _dИmarrer"
 
-#: ui/evolution.h:15
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Afficher les informations concernant Evolution"
 
-#: ui/evolution.h:16
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Afficher la barre de _dossiers"
 
-#: ui/evolution.h:17
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Afficher la barre de _raccourcis"
 
-#: ui/evolution.h:18
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "_Soumettre un rapport d'anomalies"
+
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
 msgstr "Soumets un rapport d'anomalies en utilisant Bug Buddy"
 
-#: ui/evolution.h:19
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Commute l'affichage de la barre de dossiers"
 
-#: ui/evolution.h:20
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Commute l'affichage de la barre de raccourcis"
 
-#: ui/evolution.h:21
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Utilisation du gestionnaire de c_ontact"
 
-#: ui/evolution.h:22
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Utilisation du _calendrier"
 
-#: ui/evolution.h:23
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Utilisation de la _messagerie"
 
-#: ui/evolution.h:24
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "ю _propos d'Evolution..."
 
-#: ui/evolution.h:25
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Rendez-vous (FIXME)"
 
-#: ui/evolution.h:26
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
-#: ui/evolution.h:27
-msgid "_Create New Folder..."
-msgstr "_CrИer un nouveau dossier..."
-
-#: ui/evolution.h:30
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Dossier"
 
-#: ui/evolution.h:31
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Aller au dossier..."
 
-#: ui/evolution.h:32
-msgid "_Help"
-msgstr "_Aide"
-
-#: ui/evolution.h:33
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Index"
 
-#: ui/evolution.h:34
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Message Иlectronique (FIXME)"
 
-#: ui/evolution.h:36
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_RИglages"
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "_Soumettre un rapport d'anomalies"
-
-#: ui/evolution.h:38
+#: po/tmp/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_TБche (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
+msgid "%A, %B %d, %Y"
+msgstr "%A %d %B %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Essai"
@@ -5756,43 +6793,28 @@ msgstr "Heure de _fin de la rИunion :"
 msgid "All Attendees"
 msgstr "Tout les invitИs"
 
-#. 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:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A %d %B %Y"
-
-#. 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:415
-msgid "MTWTFSS"
-msgstr "LMMJVSD"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:325
+#: widgets/misc/e-dateedit.c:408
 msgid "Now"
 msgstr "Maintenant"
 
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
-#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
-#: widgets/misc/e-dateedit.c:1127
+#. 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
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
-#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
-#: widgets/misc/e-dateedit.c:1130
+#. 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
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -5801,5 +6823,296 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Groupe %i"
 
+#~ msgid "BLARG\n"
+#~ msgstr "BLARG\n"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "йtes-vous sur de vouloir\n"
+#~ "supprimer ce contact ?"
+
+#~ msgid "window2"
+#~ msgstr "fenЙtre2"
+
+#~ msgid "_Summary:"
+#~ msgstr "RИs_umИ : "
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days\n"
+#~ msgstr ""
+#~ "Minutes\n"
+#~ "Heures\n"
+#~ "Jours\n"
+
+#~ msgid "Daily"
+#~ msgstr "JournaliХre"
+
+#~ msgid "Weekly"
+#~ msgstr "Hebdomadaire"
+
+#~ msgid "Monthly"
+#~ msgstr "Mensuelle"
+
+#~ msgid "Yearly"
+#~ msgstr "Annuelle"
+
+#~ msgid "label23"
+#~ msgstr "label23"
+
+#~ msgid "Every "
+#~ msgstr "Tou(te)s les "
+
+#~ msgid "label24"
+#~ msgstr "label24"
+
+#~ msgid "label25"
+#~ msgstr "label25"
+
+#~ msgid "Recur on the"
+#~ msgstr "RИcurrence le"
+
+#~ msgid "th day of the month"
+#~ msgstr "Хme jour du mois"
+
+#~ msgid ""
+#~ "1st\n"
+#~ "2nd\n"
+#~ "3rd\n"
+#~ "4th\n"
+#~ "5th\n"
+#~ msgstr ""
+#~ "1er\n"
+#~ "2Хme\n"
+#~ "3Хme\n"
+#~ "4Хme\n"
+#~ "5Хme\n"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday\n"
+#~ msgstr ""
+#~ "Lundi\n"
+#~ "Mardi\n"
+#~ "Mercredi\n"
+#~ "Jeudi\n"
+#~ "Vendredi\n"
+#~ "Samedi\n"
+#~ "Dimanche\n"
+
+#~ msgid "label27"
+#~ msgstr "label27"
+
+#~ msgid "Ending date"
+#~ msgstr "Date de fin"
+
+#~ msgid "End on "
+#~ msgstr "Fin le "
+
+#~ msgid "End after"
+#~ msgstr "Fin aprИs"
+
+#~ msgid "Change"
+#~ msgstr "Changer"
+
+#~ msgid "Create to-do item"
+#~ msgstr "CrИer un ИlИment 'Ю faire'"
+
+#~ msgid "Edit to-do item"
+#~ msgstr "иditer l'ИlИment 'Ю faire'"
+
+#~ msgid "Due Date:"
+#~ msgstr "Date d'ИchИance : "
+
+#~ msgid "Priority:"
+#~ msgstr "PrioritИ : "
+
+#~ msgid "Time display"
+#~ msgstr "Affichage de l'heure"
+
+#~ msgid "Time format"
+#~ msgstr "Format de l'heure"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 heures (AM/PM)"
+
+#~ msgid "24-hour"
+#~ msgstr "24 heures"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Les semaines dИbutent un"
+
+#~ msgid "Day range"
+#~ msgstr "Horaires de travail"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "SИlectionnez les heures de dИbut et de fin que\n"
+#~ "vous voulez afficher dans la vue par jour et par\n"
+#~ "semaine. Les heures en dehors de cet intervalle\n"
+#~ "ne seront pas affichИes par dИfaut."
+
+#~ msgid "Day start:"
+#~ msgstr "Heure de dИbut : "
+
+#~ msgid "Day end:"
+#~ msgstr "Heure de fin : "
+
+#~ msgid "Colors for display"
+#~ msgstr "Couleurs pour l'affichage"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "Afficher dans la liste 'ю Faire' : "
+
+#~ msgid "To Do List style options:"
+#~ msgstr "Options de style de la liste 'ю Faire' : "
+
+#~ msgid "Highlight overdue items"
+#~ msgstr "Mettre en evidence les ИlИments en retard"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "Mettre en Иvidence les ИlИments non encore achevИ"
+
+#~ msgid "Highlight items due today"
+#~ msgstr "Mettre en Иvidence les ИlИments s'achevant aujourd'hui"
+
+#~ msgid "To Do List"
+#~ msgstr "Liste 'ю Faire'"
+
+#~ msgid "Preferences"
+#~ msgstr "PrИfИrences"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmes"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "Biper lors de l'affichage des alarmes"
+
+#~ msgid "Audio alarms timeout after"
+#~ msgstr "Expiration des alarmes audios aprХs"
+
+#~ msgid " seconds"
+#~ msgstr " secondes"
+
+#~ msgid "Enable snoozing for "
+#~ msgstr "Activer la sonnerie pour"
+
+#~ msgid "Could not connect to IMAP server on %s."
+#~ msgstr "Ne peut se connecter au serveur IMAP sur %s."
+
+#~ msgid "Could not create summary"
+#~ msgstr "Ne peut crИer le rИsumИ"
+
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Ne peut obtenir le message : %s"
+
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Pour la lecture de courrier dИlivrИ par le systХme local, et pour le "
+#~ "stockage de courrier sur le disque local."
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Ne peut renommer le dossier %s vers %s : la destination existe"
+
+#~ msgid "Could not open summary %s"
+#~ msgstr "Ne peut ouvrir le rИsumИ %s"
+
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Le rИsumИ ne correspond pas, en-tЙte X-Evolution manquant"
+
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Impossible de copier les donnИes dans le fichier de sortie : %s"
+
+#~ msgid "Could not load or create summary"
+#~ msgstr "Impossible de charger ou crИer le rИsumИ"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Impossible de renommer le dossier `%s' : %s existe"
+
+#~ msgid "MH folders may not be nested."
+#~ msgstr "Les dossiers MH ne peuvent Йtre encapsulИs."
+
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr "Ne peut initialiser le composant de rИsumИ de messages d'Evolution."
+
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr "Ne peut initialiser le hachage du stockage de courrier d'Evolution."
+
+#~ msgid "Bad storage URL (no server): %s"
+#~ msgstr "Mauvaise URL de stockage (aucun serveur) : %s"
+
+#~ msgid "Custom search"
+#~ msgstr "Recherche personnel"
+
+#~ msgid "Full Search"
+#~ msgstr "Rechercher complХte"
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail configuration wizard!\n"
+#~ "By filling in some information about your email\n"
+#~ "settings, you can start sending and receiving email\n"
+#~ "right away. Click Next to continue."
+#~ msgstr ""
+#~ "Bienvenue sur l'assistant de configuration de messagerie d'Evolution !\n"
+#~ "En y remplissant les informations concernant les paramХtres de votre\n"
+#~ "messagerie, vous pourrez commencer Ю envoyer et recevoir des mails.\n"
+#~ "Cliquez sur \"Suivant\" pour continuer."
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Ne peut crИer le tube vers %s : %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Ne peut exИcuter %s : %s\n"
+
+#~ msgid " (XXX unread)"
+#~ msgstr " (XXX non lu)"
+
+#~ msgid "Retrieving messages : %s"
+#~ msgstr "RИcupИration des messages : %s"
+
+#~ msgid "Don't know protocol to open URI `%s'"
+#~ msgstr "Ne connait pas le protocole pour ouvrir l'URI `%s'"
+
+#~ msgid "Open in New Window"
+#~ msgstr "Ouvrir dans une nouvelle fenЙtre"
+
+#~ msgid "Forward Message"
+#~ msgstr "Faire suivre le message"
+
+#~ msgid "Delete Message"
+#~ msgstr "Supprimer le message"
+
+#~ msgid "Move Message"
+#~ msgstr "DИplacer le message"
+
+#~ msgid "Copy Message"
+#~ msgstr "Copier le message"
+
+#~ msgid "_New Contact"
+#~ msgstr "_Nouveau contact"
+
+#~ msgid "New Ca_lendar"
+#~ msgstr "Nouveau Ca_lendrier"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Configuration de la _messagerie..."
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "_CrИer un nouveau dossier..."
+
 #~ msgid "_Unselect All"
 #~ msgstr "_DИselectionner tout"
diff --git a/po/ga.po b/po/ga.po
index bc596e35a6..dad0f3b3d6 100755
--- a/po/ga.po
+++ b/po/ga.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS\n"
-"POT-Creation-Date: 2000-05-10 22:19-0400\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -14,442 +14,6522 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:462
-msgid "Cut"
-msgstr "Gearr"
+#: addressbook/backend/ebook/e-card.c:3046
+msgid "Card: "
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:184
-msgid "Cut selected item into clipboard"
+#: addressbook/backend/ebook/e-card.c:3048
+msgid ""
+"\n"
+"Name: "
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:463
-msgid "Copy"
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3053
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3067
+msgid ""
+"\n"
+"Birth Date: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3078
+msgid ""
+"\n"
+"Address:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3086
+msgid ""
+"\n"
+"  Country:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3138
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3141
+msgid ""
+"\n"
+"E-mail:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3178
+msgid ""
+"\n"
+"Business Role: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3191
+msgid ""
+"\n"
+"  Name:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3199
+msgid ""
+"\n"
+"Categories: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
+
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: 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/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
+msgid "Could not initialize Bonobo"
+msgstr ""
+
+#. This array must be in the same order as enumerations
+#. in GnomePilotConduitSyncType as they are used as index.
+#. Custom type implies Disabled state.
+#.
+#: addressbook/conduit/address-conduit-control-applet.c:77
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
+#: calendar/conduits/todo/todo-conduit-control-applet.c:77
+msgid "Disabled"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:78
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
+#: calendar/conduits/todo/todo-conduit-control-applet.c:78
+msgid "Synchronize"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:79
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
+#: calendar/conduits/todo/todo-conduit-control-applet.c:79
+msgid "Copy From Pilot"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:80
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
+#: calendar/conduits/todo/todo-conduit-control-applet.c:80
+msgid "Copy To Pilot"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:81
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
+#: calendar/conduits/todo/todo-conduit-control-applet.c:81
+msgid "Merge From Pilot"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:82
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
+#: calendar/conduits/todo/todo-conduit-control-applet.c:82
+msgid "Merge To Pilot"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+msgid "Original Author:"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:123
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:127
+msgid "Evolution Addressbook Conduit"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution addressbook conduit.\n"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:131
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
+msgid "gnome-unknown.xpm"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:162
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
+#: calendar/conduits/todo/todo-conduit-control-applet.c:162
+msgid "Synchronize Action"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:214
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
+msgid "Conduit state"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
+msgid ""
+"No pilot configured, please choose the\n"
+"'Pilot Link Properties' capplet first."
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:285
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
+#: calendar/conduits/todo/todo-conduit-control-applet.c:285
+msgid "Not connected to the gnome-pilot daemon"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:290
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
+msgid ""
+"An error occured when trying to fetch\n"
+"pilot list from the gnome-pilot daemon"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:210
+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
+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
+msgid "Could not start wombat"
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
+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.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
+msgid "Delete Contact?"
+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/e-contact-editor-strings.h: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
+#, fuzzy
+msgid "_Delete"
+msgstr "ScrМos"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:9
+msgid "Phone Types"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:10
+#: addressbook/contact-editor/e-contact-editor-strings.h:12
+msgid "New phone type"
+msgstr ""
+
+#.
+#. * 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
+msgid "Add"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:13
+msgid "Contact Editor"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:14
+msgid "_Full Name..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:15
+msgid "File As:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:16
+msgid "Web page address:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:17
+msgid "Wants to receive _HTML mail"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:18
+msgid "_Business"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#, fuzzy
+msgid "_Home"
+msgstr "_Nota"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
+msgid "Business _Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
+msgid "_Mobile"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
+msgid "B_usiness"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
+msgid "_This is the mailing address"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
+msgid "C_ontacts..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: po/tmp/task-editor-dialog.glade.h:8
+msgid "Ca_tegories..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
+msgid "_Job title:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#, fuzzy
+msgid "_Company:"
 msgstr "Greamaigh"
 
-#: composer/e-msg-composer-address-dialog.c:528
-msgid "Select recipients' addresses"
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+msgid "_Address..."
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: po/tmp/event-editor-dialog.glade.h:15
+msgid "General"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:31
+msgid "_Department:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:32
+msgid "_Office:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:33
+msgid "_Profession:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:34
+msgid "_Nickname:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:35
+msgid "_Spouse:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:36
+msgid "_Birthday:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:37
+msgid "_Assistant's name:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:38
+msgid "_Manager's Name:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:39
+msgid "Anni_versary:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:40
+#, fuzzy
+msgid "No_tes:"
+msgstr "_Nota"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:41
+#: po/tmp/task-editor-dialog.glade.h:13
+msgid "Details"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+#, fuzzy
+msgid "Company"
+msgstr "Greamaigh"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#, fuzzy
+msgid "Primary"
+msgstr "TosaМocht"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:8
+msgid "Check Address"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:12
+msgid "_Address:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:13
+msgid "_City:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:14
+msgid "_PO Box:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:15
+msgid "_State/Province:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:16
+msgid "_ZIP Code:"
+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/fullname-strings.h:7
+msgid "Check Full Name"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:8
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Dr.\n"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:13
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq.\n"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:21
+msgid "_First:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:22
+msgid "_Title:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:23
+msgid "_Middle:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:24
+msgid "_Last:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:25
+msgid "_Suffix:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:263
+msgid "As _Minicards"
+msgstr ""
+
+#.
+#. * 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
+msgid "As _Table"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:386
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:391
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or have tried\n"
+"to access an LDAP server and don't have LDAP support\n"
+"compiled in.  If you've entered a URI, check the URI for\n"
+"correctness and reenter.  If not, you probably have\n"
+"attempted to access an LDAP server.  If you wish to be\n"
+"able to use LDAP, you'll need to download and install\n"
+"OpenLDAP and recompile and install Evolution.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+msgid "Show All"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+msgid "Advanced..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:533
+msgid "Any field contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:534
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:535
+msgid "Email contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:621
+msgid "The URI that the Folder Browser will display"
+msgstr ""
+
+#: 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 ""
+
+#: po/tmp/ldap-server-dialog.glade.h:7
+msgid "LDAP Server:"
+msgstr ""
+
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr ""
+
+#: po/tmp/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr ""
+
+#: po/tmp/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/select-names.glade.h:6
+msgid "Find..."
+msgstr ""
+
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr ""
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr ""
+
+#: po/tmp/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr ""
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/alphabet.glade.h:6
+msgid "123"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:7
+msgid "a"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:8
+msgid "b"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:9
+msgid "c"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:10
+msgid "d"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:11
+msgid "e"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:12
+msgid "f"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:13
+msgid "g"
+msgstr ""
+
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+msgid "h"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:15
+msgid "i"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:16
+msgid "j"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:17
+msgid "k"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:18
+msgid "l"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:19
+msgid "m"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:20
+msgid "n"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:21
+#, fuzzy
+msgid "o"
+msgstr "Do"
+
+#: po/tmp/alphabet.glade.h:22
+msgid "p"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:23
+msgid "q"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:24
+msgid "r"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:25
+msgid "s"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:26
+msgid "t"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:27
+msgid "u"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:28
+msgid "v"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:29
+msgid "w"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:30
+msgid "x"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:31
+msgid "y"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:32
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
+msgid "Save as VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:278
+msgid "Save in addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-view.c:111
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+
+#.
+#. * 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
+msgid "10 pt. Tahoma"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:15
+#, fuzzy
+msgid "Format"
+msgstr "Sheoladh Chuig duine"
+
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:18
+msgid "Headings"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:33
+msgid "Paper source:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:34
+#, fuzzy
+msgid "Portrait"
+msgstr "TosaМocht"
+
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:38
+msgid "Right:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:41
+#, fuzzy
+msgid "Size:"
+msgstr "MИid"
+
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:44
+#, fuzzy
+msgid "Top:"
+msgstr "Do:"
+
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr ""
+
+#: po/tmp/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 ""
+
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution calendar conduit.\n"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
+msgid "Error while communicating with calendar server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:127
+msgid "Evolution ToDo Conduit"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution todo conduit.\n"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:60
+msgid "Outline:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:61
+msgid "Headings:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:62
+msgid "Empty days:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:63
+#, fuzzy
+msgid "Appointments:"
+msgstr "_Coinne"
+
+#: calendar/gui/calendar-commands.c:64
+msgid "Highlighted day:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:65
+msgid "Day numbers:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:66
+msgid "Current day's number:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:67
+msgid "To-Do item that is not yet due:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:68
+msgid "To-Do item that is due today:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:69
+msgid "To-Do item that is overdue:"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:354
+msgid "File not found"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:378
+msgid "Open calendar"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:417
+msgid "Save calendar"
+msgstr ""
+
+#. strftime format of a weekday and a date.
+#: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+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
+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
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
+msgid "Public"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:347 po/tmp/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
+msgid "Confidential"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+msgid "Unknown"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:441
+msgid "N"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:441
+msgid "S"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:443
+msgid "E"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:443
+msgid "W"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:515
+msgid "Transparent"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:518
+msgid "Opaque"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:744
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+
+#. strptime format for a date.
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+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
+msgid "%I:%M:%S %p%n"
+msgstr ""
+
+#. strptime format for a time of day, in 24-hour format.
+#: calendar/gui/calendar-model.c:866
+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
+msgid "%I:%M %p%n"
+msgstr ""
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: calendar/gui/calendar-model.c:873
+msgid "%H:%M%n"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:993
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1033
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:1073
+msgid "The priority must be between 1 and 9, inclusive"
+msgstr ""
+
+#: calendar/gui/control-factory.c:125
+msgid "The URI that the calendar will display"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+msgstr ""
+
+#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+msgid "No summary available."
+msgstr ""
+
+#.
+#. * 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
+msgid "Close"
+msgstr ""
+
+#: po/tmp/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
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#.
+#. * 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
+msgid "05 minutes"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr ""
+
+#: po/tmp/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
+msgid "Fri"
+msgstr ""
+
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: po/tmp/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
+msgid "Mon"
+msgstr ""
+
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "TosaМocht"
+
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr ""
+
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr ""
+
+#: po/tmp/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
+msgid "Sun"
+msgstr ""
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+#, fuzzy
+msgid "Sunday"
+msgstr "Post"
+
+#: po/tmp/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
+msgid "Thu"
+msgstr ""
+
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr ""
+
+#: po/tmp/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
+msgid "Tue"
+msgstr ""
+
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr ""
+
+#: po/tmp/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
+msgid "Wed"
+msgstr ""
+
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
+msgstr ""
+
+#.
+#. * 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
+msgid "% Comp_lete:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "None"
+msgstr "_Nota"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:24
+#, fuzzy
+msgid "Task"
+msgstr "_Teacs"
+
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:28
+#, fuzzy
+msgid "_Priority:"
+msgstr "TosaМocht"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "_Coinne"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
+#, fuzzy
+msgid "Open..."
+msgstr "_OscАil"
+
+#: calendar/gui/e-calendar-table.c:337
+msgid "Open the task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:339
+msgid "Mark Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:340
+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"
+msgstr "ScrМos an sceal seo"
+
+#: calendar/gui/e-day-view-time-item.c:516
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: 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-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-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
+#, 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
+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
+#, 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
+msgid "Make this appointment movable"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#, 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
+msgid "Delete all occurrences"
+msgstr ""
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr ""
+
+#.
+#. * 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
+msgid "A_ll day event"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "_Coinne"
+
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:22
+#, fuzzy
+msgid "Pri_vate"
+msgstr "PriontАil"
+
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:38
+msgid "_Starting date:"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "year(s)"
+msgstr ""
+
+#: calendar/gui/event-editor.c:329
+#, fuzzy
+msgid "Edit Appointment"
+msgstr "_Coinne"
+
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr ""
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr ""
+
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr ""
+
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr ""
+
+#: calendar/gui/event-editor.c:839
+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
+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"
+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 "PriontАil"
+
+#: calendar/gui/getdate.y:451
+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 ""
+
+#: calendar/gui/print.c:288
+msgid "1st"
+msgstr ""
+
+#: calendar/gui/print.c:288
+msgid "2nd"
+msgstr ""
+
+#: calendar/gui/print.c:288
+msgid "3rd"
+msgstr ""
+
+#: calendar/gui/print.c:288
+msgid "4th"
+msgstr ""
+
+#: calendar/gui/print.c:288
+msgid "5th"
+msgstr ""
+
+#: calendar/gui/print.c:289
+msgid "6th"
+msgstr ""
+
+#: calendar/gui/print.c:289
+msgid "7th"
+msgstr ""
+
+#: calendar/gui/print.c:289
+msgid "8th"
+msgstr ""
+
+#: calendar/gui/print.c:289
+msgid "9th"
+msgstr ""
+
+#: calendar/gui/print.c:289
+msgid "10th"
+msgstr ""
+
+#: calendar/gui/print.c:290
+msgid "11th"
+msgstr ""
+
+#: calendar/gui/print.c:290
+msgid "12th"
+msgstr ""
+
+#: calendar/gui/print.c:290
+msgid "13th"
+msgstr ""
+
+#: calendar/gui/print.c:290
+msgid "14th"
+msgstr ""
+
+#: calendar/gui/print.c:290
+msgid "15th"
+msgstr ""
+
+#: calendar/gui/print.c:291
+msgid "16th"
+msgstr ""
+
+#: calendar/gui/print.c:291
+msgid "17th"
+msgstr ""
+
+#: calendar/gui/print.c:291
+msgid "18th"
+msgstr ""
+
+#: calendar/gui/print.c:291
+msgid "19th"
+msgstr ""
+
+#: calendar/gui/print.c:291
+msgid "20th"
+msgstr ""
+
+#: calendar/gui/print.c:292
+msgid "21st"
+msgstr ""
+
+#: calendar/gui/print.c:292
+msgid "22nd"
+msgstr ""
+
+#: calendar/gui/print.c:292
+msgid "23rd"
+msgstr ""
+
+#: calendar/gui/print.c:292
+msgid "24th"
+msgstr ""
+
+#: calendar/gui/print.c:292
+msgid "25th"
+msgstr ""
+
+#: calendar/gui/print.c:293
+msgid "26th"
+msgstr ""
+
+#: calendar/gui/print.c:293
+msgid "27th"
+msgstr ""
+
+#: calendar/gui/print.c:293
+msgid "28th"
+msgstr ""
+
+#: calendar/gui/print.c:293
+msgid "29th"
+msgstr ""
+
+#: calendar/gui/print.c:293
+msgid "30th"
+msgstr ""
+
+#: calendar/gui/print.c:294
+msgid "31st"
+msgstr ""
+
+#: calendar/gui/print.c:350
+msgid "Su"
+msgstr ""
+
+#: calendar/gui/print.c:350
+msgid "Mo"
+msgstr ""
+
+#: calendar/gui/print.c:350
+msgid "Tu"
+msgstr ""
+
+#: calendar/gui/print.c:350
+msgid "We"
+msgstr ""
+
+#: calendar/gui/print.c:350
+msgid "Th"
+msgstr ""
+
+#: calendar/gui/print.c:350
+#, fuzzy
+msgid "Fr"
+msgstr "с:"
+
+#: calendar/gui/print.c:350
+msgid "Sa"
+msgstr ""
+
+#: calendar/gui/print.c:936
+#, fuzzy
+msgid "Tasks"
+msgstr "_Teacs"
+
+#. Day
+#: calendar/gui/print.c:1066
+msgid "Current day (%a %b %d %Y)"
+msgstr ""
+
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+msgid "%a %b %d"
+msgstr ""
+
+#: calendar/gui/print.c:1081
+msgid "%a %d %Y"
+msgstr ""
+
+#: calendar/gui/print.c:1092
+#, c-format
+msgid "Current week (%s - %s)"
+msgstr ""
+
+#. Month
+#: calendar/gui/print.c:1100
+msgid "Current month (%b %Y)"
+msgstr ""
+
+#. Year
+#: calendar/gui/print.c:1107
+msgid "Current year (%Y)"
+msgstr ""
+
+#: calendar/gui/print.c:1144
+msgid "Print Calendar"
+msgstr ""
+
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
+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
+msgid "SMTWTFS"
+msgstr ""
+
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr ""
+
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:146
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:156
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:197
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:243
+#, c-format
+msgid "Error reading mail file: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:254
+#, c-format
+msgid "Error writing mail temp file: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:272
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:304
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:316
+#, c-format
+msgid "Could not fork: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:354
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:355
+msgid "(Unknown error)"
+msgstr ""
+
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
+msgstr ""
+
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr ""
+
+#: camel/camel-remote-store.c:182
+#, c-format
+msgid "%s server %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:186
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:227
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:228
+msgid "(unknown host)"
+msgstr ""
+
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr ""
+
+#: camel/camel-service.c:129
+#, c-format
+msgid "URL '%s' needs a host component"
+msgstr ""
+
+#: camel/camel-service.c:138
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr ""
+
+#: camel/camel-service.c:488
+#, c-format
+msgid "No such host %s."
+msgstr ""
+
+#: camel/camel-service.c:491
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr ""
+
+#: camel/camel-session.c:272
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
+#: camel/camel-session.c:360
+#, c-format
+msgid ""
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-url.c:78
+#, c-format
+msgid "URL string `%s' contains no protocol"
+msgstr ""
+
+#: camel/camel-url.c:93
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
+msgstr ""
+
+#: camel/camel-url.c:154
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:216
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:224
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+msgid "Unknown error"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:407
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:443
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:216
+#, c-format
+msgid "Could not load summary for %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:586
+msgid "Could not find message body in FETCH response."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:41
+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
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:333
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:359
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:539
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
+#, c-format
+msgid "Folder `%s' does not exist."
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, 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
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:117
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:160
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:234
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:341
+#, 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
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:491
+#, 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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:562
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:579
+#, 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
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:604
+#, c-format
+msgid "Could not close temp folder: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:615
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:817
+#, c-format
+msgid "Unknown error: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mh-store.c:116
+#, c-format
+msgid "`%s' is not a directory."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: 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:144
+#, c-format
+msgid "Message %s not found."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:179
+msgid "Could not open folder: message listing was incomplete."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:273
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:150
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:160
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:172
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:217
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:335
+#, c-format
+msgid "Could not connect to POP server on %s."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:389
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, 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
+msgid "(Unknown)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:438
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:446
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:555
+#, c-format
+msgid "No such folder `%s'."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#, fuzzy
+msgid "Sendmail"
+msgstr "Post"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, c-format
+msgid "Could not send message: %s"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:76
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+msgid "sendmail"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:30
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:78
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytanna"
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:93
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:307
-msgid "Add attachment"
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+msgid "attachment"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:364
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/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
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "ScrМos"
 
-#: composer/e-msg-composer-attachment-bar.c:365
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:397
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr ""
 
-#: composer/e-msg-composer-attachment.c:259
-msgid "Select attachment"
+#.
+#. * 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
+msgid "Attachment properties"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:89
+#: po/tmp/e-msg-composer-attachment.glade.h:8
+msgid "File name:"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "From:"
+msgstr "с:"
+
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:124
+#: composer/e-msg-composer-hdrs.c:291
+msgid "Enter the identity you wish to send this message from"
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Do:"
 
-#: composer/e-msg-composer-hdrs.c:125
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:129
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:130
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:135
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:136
+#: composer/e-msg-composer-hdrs.c:307
 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:142
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Abair:"
 
-#: composer/e-msg-composer-hdrs.c:143
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr ""
 
-#: composer/e-msg-composer.c:420
-msgid "Save in _folder..."
-msgstr "SАbhАil 'san _fillteАn"
+#: composer/e-msg-composer.c:429
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
 
-#: composer/e-msg-composer.c:420
-msgid "Save the message in a specified folder"
+#: composer/e-msg-composer.c:599
+msgid "Save as..."
 msgstr ""
 
-#: composer/e-msg-composer.c:423 composer/e-msg-composer.c:460
-#: mail/folder-browser-factory.c:138
-msgid "Send"
+#: composer/e-msg-composer.c:610
+#, c-format
+msgid "Error saving file: %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:630
+#, c-format
+msgid "Error loading file: %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:652
+msgid "Saving changes to message..."
+msgstr ""
+
+#: composer/e-msg-composer.c:654
+#, fuzzy
+msgid "Save changes to message..."
+msgstr "Post an sceАl seo"
+
+#: composer/e-msg-composer.c:695
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:745
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: composer/e-msg-composer.c:767
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:893
+msgid "That file does not exist."
+msgstr ""
+
+#: composer/e-msg-composer.c:903
+msgid "That is not a regular file."
+msgstr ""
+
+#: composer/e-msg-composer.c:913
+msgid "That file exists but is not readable."
+msgstr ""
+
+#: composer/e-msg-composer.c:923
+msgid "That file appeared accesible but open(2) failed."
+msgstr ""
+
+#: composer/e-msg-composer.c:945
+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
+msgid "An error occurred while reading the file."
+msgstr ""
+
+#: composer/e-msg-composer.c:1343
+#, fuzzy
+msgid "Compose a message"
+msgstr "Post an sceАl seo"
+
+#: composer/e-msg-composer.c:1420
+msgid "Could not create composer window."
+msgstr ""
+
+#: composer/evolution-composer.c:307
+msgid "Cannot initialize Evolution's composer."
+msgstr ""
+
+#: filter/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr ""
+
+#: filter/filter-datespec.c:62
+msgid "years"
+msgstr ""
+
+#: filter/filter-datespec.c:63
+msgid "months"
+msgstr ""
+
+#: filter/filter-datespec.c:64
+msgid "weeks"
+msgstr ""
+
+#: filter/filter-datespec.c:65
+msgid "days"
+msgstr ""
+
+#: filter/filter-datespec.c:66
+msgid "hours"
+msgstr ""
+
+#: filter/filter-datespec.c:67
+msgid "minutes"
+msgstr ""
+
+#: filter/filter-datespec.c:68
+msgid "seconds"
+msgstr ""
+
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
+msgid ""
+"The message's date will be compared against\n"
+"whatever the time is when the filter is run\n"
+"or vfolder is opened."
+msgstr ""
+
+#: filter/filter-datespec.c:282
+msgid ""
+"The message's date will be compared against\n"
+"the time that you specify here."
+msgstr ""
+
+#: filter/filter-datespec.c:322
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when the filter is run;\n"
+"\"a week ago\", for example."
+msgstr ""
+
+#. keep in sync with FilterDatespec_type!
+#: filter/filter-datespec.c:357
+msgid "the current time"
+msgstr ""
+
+#: filter/filter-datespec.c:357
+msgid "a time you specify"
+msgstr ""
+
+#: filter/filter-datespec.c:358
+msgid "a time relative to the current time"
+msgstr ""
+
+#. The label
+#: filter/filter-datespec.c:416
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter-datespec.c:690
+msgid "<click here to select a date>"
+msgstr ""
+
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
+msgid "Add Filter Rule"
+msgstr ""
+
+#: filter/filter-editor.c:233
+msgid "Edit Filter Rule"
+msgstr ""
+
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+msgid "Edit Filters"
+msgstr ""
+
+#. and now for the action area
+#: filter/filter-filter.c:401
+msgid "Then"
+msgstr ""
+
+#: filter/filter-filter.c:414
+msgid "Add action"
+msgstr ""
+
+#: filter/filter-filter.c:420
+#, fuzzy
+msgid "Remove action"
+msgstr "ScrМos"
+
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#, fuzzy
+msgid "Select Folder"
+msgstr "FillteАn _Nua"
+
+#: filter/filter-folder.c:243
+msgid "Enter folder URI"
+msgstr ""
+
+#: filter/filter-folder.c:289
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: filter/filter-input.c:184
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:520
+msgid "Rule name: "
+msgstr ""
+
+#: filter/filter-rule.c:524
+msgid "Untitled"
+msgstr ""
+
+#: filter/filter-rule.c:540
+msgid "If"
+msgstr ""
+
+#: filter/filter-rule.c:557
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:561
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:566
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:577
+msgid "Add criterion"
+msgstr ""
+
+#: filter/filter-rule.c:583
+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 ""
+
+#: po/tmp/filter.glade.h:10
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "_FillteАn"
+
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr ""
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr ""
+
+#: po/tmp/filter.glade.h:15
+msgid "Virtual Folders"
+msgstr ""
+
+#: po/tmp/filter.glade.h:16
+msgid "vFolder Sources"
+msgstr ""
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Colour"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:4
+msgid "Copy to Folder"
+msgstr ""
+
+#: filter/libfilter-i18n.h:5
+msgid "Date received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:6
+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 ""
+
+#: filter/libfilter-i18n.h:12
+msgid "Message was received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:13
+msgid "Message was sent"
+msgstr ""
+
+#: filter/libfilter-i18n.h:14
+#, fuzzy
+msgid "Move to Folder"
+msgstr "FillteАn _Nua"
+
+#: filter/libfilter-i18n.h:16
+msgid "Recipients"
+msgstr ""
+
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+#, fuzzy
+msgid "Sender"
 msgstr "Post"
 
-#: composer/e-msg-composer.c:423
-msgid "Send the message"
+#: filter/libfilter-i18n.h:19
+msgid "Set Status"
+msgstr ""
+
+#: filter/libfilter-i18n.h:20
+msgid "Source"
+msgstr ""
+
+#: filter/libfilter-i18n.h:21
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
+msgid "Status"
+msgstr ""
+
+#: filter/libfilter-i18n.h:23
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:24
+msgid "Subject"
+msgstr "Abair"
+
+#: filter/libfilter-i18n.h:25
+msgid "after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:26
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:27
+msgid "contains"
+msgstr ""
+
+#: filter/libfilter-i18n.h:28
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30
+msgid "does not exist"
+msgstr ""
+
+#: filter/libfilter-i18n.h:31
+msgid "does not sound like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:32
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
+msgid "is greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+msgid "is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:39
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:40
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "was after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "was before"
+msgstr ""
+
+#: filter/score-editor.c:127
+msgid "Add Rule"
+msgstr ""
+
+#: filter/score-editor.c:166
+msgid "Edit Score Rule"
+msgstr ""
+
+#: filter/score-rule.c:192 filter/score-rule.c:194
+msgid "Score"
+msgstr ""
+
+#: filter/vfolder-editor.c:155
+msgid "Add VFolder Rule"
+msgstr ""
+
+#: filter/vfolder-editor.c:204
+msgid "Edit VFolder Rule"
+msgstr ""
+
+#: mail/component-factory.c:227
+msgid "Cannot initialize Evolution's mail component."
+msgstr ""
+
+#: mail/component-factory.c:266
+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
+msgid "Save"
+msgstr ""
+
+#: mail/folder-browser.c:153
+msgid "Body or subject contains"
+msgstr ""
+
+#: mail/folder-browser.c:154
+msgid "Body contains"
+msgstr ""
+
+#: mail/folder-browser.c:155
+#, fuzzy
+msgid "Subject contains"
+msgstr "Abair"
+
+#: mail/folder-browser.c:156
+msgid "Body does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:157
+msgid "Subject does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:458
+msgid "Filter on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "_OscАil"
+
+#: mail/folder-browser.c:466
+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
+msgid "Print"
+msgstr "PriontАil"
+
+#: mail/folder-browser.c:469
+msgid "Reply to Sender"
+msgstr ""
+
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
+msgid "Reply to All"
+msgstr ""
+
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Sheoladh Chuig duine"
+
+#: mail/folder-browser.c:474
+msgid "Mark as Read"
+msgstr ""
+
+#: mail/folder-browser.c:475
+msgid "Mark as Unread"
+msgstr ""
+
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "SАbhАil 'san _fillteАn"
+
+#: mail/folder-browser.c:478
+msgid "Copy to Folder..."
+msgstr ""
+
+#: mail/folder-browser.c:480
+#, 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
+msgid "Apply Filters"
+msgstr ""
+
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
+
+#: mail/mail-autofilter.c:71
+#, c-format
+msgid "Mail to %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Abair"
+
+#: mail/mail-autofilter.c:230
+#, c-format
+msgid "Mail from %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:331
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: mail/mail-callbacks.c:74
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+
+#: mail/mail-callbacks.c:114
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:128
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+msgid "You have no mail sources configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:213
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:222
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:246
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
+msgid "Move message(s) to"
+msgstr ""
+
+#: mail/mail-callbacks.c:554
+msgid "Copy message(s) to"
+msgstr ""
+
+#: mail/mail-callbacks.c:665
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-callbacks.c:748
+msgid "Save Message As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:750
+msgid "Save Messages As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:877
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-callbacks.c:922
+#, fuzzy
+msgid "Print Message"
 msgstr "Post an sceАl seo"
 
-#: composer/e-msg-composer.c:431
-msgid "View _attachments"
+#: mail/mail-callbacks.c:969
+msgid "Printing of message failed"
 msgstr ""
 
-#: composer/e-msg-composer.c:431
-msgid "View/hide attachments"
+#.
+#. * 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
+msgid "Identity"
 msgstr ""
 
-#: composer/e-msg-composer.c:460
-msgid "Send this message"
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
 msgstr ""
 
-#: composer/e-msg-composer.c:462
-msgid "Cut selected region into the clipboard"
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
 msgstr ""
 
-#: composer/e-msg-composer.c:463
-msgid "Copy selected region into the clipboard"
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
 msgstr ""
 
-#: composer/e-msg-composer.c:464
-msgid "Paste selected region into the clipboard"
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
 msgstr ""
 
-#: composer/e-msg-composer.c:465
-msgid "Undo"
-msgstr "LeasЗ"
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
 
-#: composer/e-msg-composer.c:465
-msgid "Undo last operation"
+#: mail/mail-config-gui.c:433
+msgid ""
+"Enter your name and email address to be used in outgoing mail. You may also, "
+"optionally, enter the name of your organization, and the name of a file to "
+"read your signature from."
 msgstr ""
 
-#: composer/e-msg-composer.c:467
-msgid "Attach"
+#: mail/mail-config-gui.c:446
+msgid "Full name:"
 msgstr ""
 
-#: composer/e-msg-composer.c:467
-msgid "Attach a file"
+#: mail/mail-config-gui.c:470
+msgid "Email address:"
+msgstr ""
+
+#: mail/mail-config-gui.c:485
+msgid "Organization:"
+msgstr ""
+
+#: mail/mail-config-gui.c:496
+msgid "Signature file:"
 msgstr ""
 
-#: mail/folder-browser-factory.c:85
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
+msgid "Signature File"
+msgstr ""
+
+#: mail/mail-config-gui.c:922
+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 ""
+
+#: mail/mail-config-gui.c:1003
+msgid "Test Settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:1130
+msgid "Mail source type:"
+msgstr ""
+
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release of\n"
-"the Evolution groupware suite.\n"
-"\n"
-"The Evolution team has worked hard to make Evolution as robust,\n"
-"extensible, pretty, fast and well-suited to heavy internet users as\n"
-"possible.  And we're very tired.  But we're not done -- not yet.\n"
-"\n"
-"As you explore Evolution, please understand that most of our work has\n"
-"been focused on the backend engine which drives the entire system and\n"
-"not on the user interface.  We are just cresting the hill now, though,\n"
-"and will be pouring most of our love and attention into the UI from\n"
-"here out.  But at least you know that you're not using demoware.\n"
+"Select the kind of mail server you have, and enter the relevant information "
+"about it.\n"
 "\n"
-"So, time for the nerdy disclaimer.  Evolution will: crash, lose your\n"
-"mail, leave stray processes running, consume 100% CPU, race, lock,\n"
-"send HTML mail to random mailing lists, and embarass you in front of\n"
-"your friends and co-workers.  Use at your own risk.\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:1154
+msgid "News source type:"
+msgstr ""
+
+#: mail/mail-config-gui.c:1159
+msgid ""
+"Select the kind of news server you have, and enter the relevant information "
+"about it.\n"
 "\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\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:1178
+msgid "Mail transport type:"
+msgstr ""
+
+#: mail/mail-config-gui.c:1233
+msgid "Add Identity"
+msgstr ""
+
+#: mail/mail-config-gui.c:1235
+msgid "Edit Identity"
+msgstr ""
+
+#: mail/mail-config-gui.c:1333
+msgid "Add Source"
+msgstr ""
+
+#: mail/mail-config-gui.c:1335
+msgid "Edit Source"
+msgstr ""
+
+#: mail/mail-config-gui.c:1430
+msgid "Add News Server"
+msgstr ""
+
+#: mail/mail-config-gui.c:1432
+msgid "Edit News Server"
+msgstr ""
+
+#: mail/mail-config-gui.c:2253
+#, c-format
+msgid "Testing \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2255
+#, c-format
+msgid "Test connection to \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2296
+msgid "The connection was successful!"
+msgstr ""
+
+#: mail/mail-config-gui.c:2346
+#, c-format
+msgid "Querying authorization capabilities of \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2348
+#, c-format
+msgid "Query authorization at \"%s\""
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:7
+msgid "Address"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:11
+msgid "Mail Sources"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:14
+msgid "News Servers"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:15
+msgid "News Sources"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:18
+msgid "Send messages in HTML format"
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
 msgstr ""
 
-#: mail/folder-browser-factory.c:113
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+msgid "Please enter your PGP/GPG passphrase."
+msgstr ""
+
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+msgid "No password provided."
+msgstr ""
+
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/mail-crypto.c:625
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/mail-display.c:90
+#, c-format
 msgid ""
-"Thanks\n"
-"The Evolution Team\n"
+"Could not open file %s:\n"
+"%s"
 msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
 
-#: mail/folder-browser-factory.c:137
-msgid "Get mail"
+#: mail/mail-display.c:113
+#, c-format
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/folder-browser-factory.c:137
-msgid "Check for new mail"
+#: mail/mail-display.c:218
+msgid "Save Attachment"
 msgstr ""
 
-#: mail/folder-browser-factory.c:138
-msgid "Send a new message"
+#: mail/mail-display.c:258
+#, c-format
+msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/folder-browser-factory.c:139
-msgid "Find"
+#: mail/mail-display.c:300
+msgid "Save to Disk..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:139
-msgid "Find messages"
+#: mail/mail-display.c:302
+#, c-format
+msgid "Open in %s..."
 msgstr ""
 
-#: mail/folder-browser-factory.c:143
-msgid "Reply"
+#: mail/mail-display.c:304
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:328
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:351
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:355
+msgid "Hide"
+msgstr ""
+
+#: mail/mail-format.c:500
+#, c-format
+msgid "%s attachment"
+msgstr ""
+
+#: mail/mail-format.c:623
+#, fuzzy
+msgid "Reply-To:"
 msgstr "Freagrair"
 
-#: mail/folder-browser-factory.c:143
-msgid "Reply to the sender of this message"
+#: mail/mail-format.c:845
+msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/folder-browser-factory.c:144
-msgid "Reply to All"
+#: mail/mail-format.c:857
+msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/folder-browser-factory.c:144
-msgid "Reply to all recipients of this message"
+#: mail/mail-format.c:863
+#, fuzzy
+msgid "Encrypted message"
+msgstr "Post an sceАl seo"
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/folder-browser-factory.c:146
-msgid "Forward"
-msgstr "Sheoladh Chuig duine"
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
 
-#: mail/folder-browser-factory.c:146
-msgid "Forward this message"
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/folder-browser-factory.c:150
-msgid "Print"
-msgstr "PriontАil"
+#: mail/mail-format.c:1486
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
 
-#: mail/folder-browser-factory.c:150
-msgid "Print the selected message"
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/folder-browser-factory.c:152
-msgid "Delete"
-msgstr "ScrМos"
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:206
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:261
+msgid "Closing current folder"
+msgstr ""
+
+#: mail/mail-local.c:293
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:314
+msgid "Creating new folder"
+msgstr ""
+
+#: mail/mail-local.c:329
+#, fuzzy
+msgid "Copying messages"
+msgstr "_Post sceАl"
+
+#: mail/mail-local.c:341
+#, 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
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
+#: mail/mail-local.c:781
+msgid "Registering local folder"
+msgstr ""
+
+#: mail/mail-local.c:783
+msgid "Register local folder"
+msgstr ""
+
+#: mail/mail-ops.c:79
+#, c-format
+msgid "Fetching email from %s"
+msgstr ""
+
+#: mail/mail-ops.c:81
+#, c-format
+msgid "Fetch email from %s"
+msgstr ""
+
+#: mail/mail-ops.c:331
+#, c-format
+msgid "There is no new mail at %s."
+msgstr ""
+
+#: mail/mail-ops.c:401
+msgid "Filtering email on demand"
+msgstr ""
+
+#: mail/mail-ops.c:403
+msgid "Filter email on demand"
+msgstr ""
+
+#: mail/mail-ops.c:538
+#, 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:720
+msgid "Sending queue"
+msgstr ""
+
+#: mail/mail-ops.c:722
+msgid "Send queue"
+msgstr ""
+
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#, c-format
+msgid "Appending \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
+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
+#, c-format
+msgid "Moving messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1003
+#, c-format
+msgid "Copying messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1006
+#, c-format
+msgid "Move messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1008
+#, c-format
+msgid "Copy messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1039
+msgid "Moving"
+msgstr ""
+
+#: mail/mail-ops.c:1042
+#, fuzzy
+msgid "Copying"
+msgstr "Greamaigh"
+
+#: mail/mail-ops.c:1062
+#, 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
+#, 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
+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
+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
+#, 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: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 ""
+
+#: 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:2428
+#, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2431
+#, c-format
+msgid "Save messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2474
+#, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:104
+msgid "Cancel"
+msgstr ""
+
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-threads.c:301
+#, c-format
+msgid ""
+"Error while preparing to %s:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:675
+#, c-format
+msgid ""
+"Error while `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:732
+msgid "Error reading commands from dispatching thread."
+msgstr ""
+
+#: mail/mail-threads.c:797
+msgid "Corrupted message from dispatching thread?"
+msgstr ""
+
+#: mail/mail-threads.c:916
+msgid "Could not create dialog box."
+msgstr ""
+
+#: mail/mail-threads.c:927
+msgid "User cancelled query."
+msgstr ""
+
+#: mail/mail-tools.c:189
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr ""
+
+#. Get all uids of source
+#: mail/mail-tools.c:239
+#, c-format
+msgid "Examining %s"
+msgstr ""
+
+#: mail/mail-tools.c:269
+#, c-format
+msgid ""
+"Could not read UID cache file \"%s\". You may receive duplicate messages."
+msgstr ""
+
+#. Info
+#: mail/mail-tools.c:290
+#, c-format
+msgid "Retrieving message %d of %d"
+msgstr ""
+
+#. Append it to dest
+#: mail/mail-tools.c:303
+#, c-format
+msgid "Writing message %d of %d"
+msgstr ""
+
+#: mail/mail-tools.c:332
+#, c-format
+msgid "Saving changes to %s"
+msgstr ""
+
+#: mail/mail-tools.c:369
+#, c-format
+msgid "[%s] (forwarded message)"
+msgstr ""
+
+#: mail/mail-tools.c:379
+msgid "Fwd: (no subject)"
+msgstr ""
+
+#: mail/mail-tools.c:418
+#, c-format
+msgid "Forwarded message - %s"
+msgstr ""
+
+#: mail/mail-tools.c:420
+msgid "Forwarded message (no subject)"
+msgstr ""
+
+#: mail/mail-tools.c:523
+#, c-format
+msgid ""
+"Cannot open location `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-vfolder.c:147
+#, fuzzy
+msgid "VFolders"
+msgstr "_FillteАn"
+
+#: mail/mail-vfolder.c:296
+#, fuzzy
+msgid "New VFolder"
+msgstr "FillteАn _Nua"
 
-#: mail/folder-browser-factory.c:152
+#. 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
+msgid "Reply"
+msgstr "Freagrair"
+
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+msgid "Reply to the sender of this message"
+msgstr ""
+
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+msgid "Reply to all recipients of this message"
+msgstr ""
+
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+msgid "Forward this message"
+msgstr ""
+
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+msgid "Print the selected message"
+msgstr ""
+
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "ScrМos an sceal seo"
 
-#: mail/folder-browser-factory.c:169
-msgid "_Expunge"
+#: mail/message-list.c:572
+msgid "Unseen"
 msgstr ""
 
-#: mail/folder-browser-factory.c:292
-msgid "We are sorry, Evolution's Folder Browser can not be initialized."
+#: mail/message-list.c:575
+#, fuzzy
+msgid "Seen"
+msgstr "Post"
+
+#: mail/message-list.c:578
+msgid "Answered"
 msgstr ""
 
-#: mail/folder-browser.c:207
-msgid "The URI that the Folder Browser will display"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
 msgstr ""
 
-#: mail/folder-browser.c:210
-msgid "Whether a message preview should be shown"
+#. 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
+#, c-format
+msgid "%s, et al."
 msgstr ""
 
-#: mail/main.c:54
-msgid "Mail Component: I could not initialize Bonobo"
+#: mail/message-list.c:860 mail/message-list.c:875
+msgid "<unknown>"
 msgstr ""
 
-#: mail/message-list.c:421
-msgid "Priority"
-msgstr "TosaМocht"
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
+msgstr ""
 
-#: mail/message-list.c:435
-msgid "From"
-msgstr "с:"
+#: mail/message-list.c:2070
+#, fuzzy
+msgid "Rebuild message view"
+msgstr "_Post sceАl"
 
-#: mail/message-list.c:442
-msgid "Subject"
-msgstr "Abair"
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
+msgstr ""
 
-#: mail/message-list.c:449
-msgid "Sent"
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/message-list.c:456
-msgid "Receive"
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/message-list.c:463
-msgid "To"
-msgstr "Do"
+#: mail/subscribe-dialog.c:282
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr ""
 
-#: mail/message-list.c:470
-msgid "Size"
-msgstr "MИid"
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:290
+#, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr ""
+
+#: shell/e-setup.c:112 shell/e-setup.c:183
+msgid "Evolution installation"
+msgstr ""
+
+#: shell/e-setup.c:116
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
+msgstr ""
+
+#: shell/e-setup.c:117
+msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+msgstr ""
+
+#: shell/e-setup.c:155
+msgid "Could not update files correctly"
+msgstr ""
+
+#: shell/e-setup.c:158 shell/e-setup.c:224
+msgid "Evolution files successfully installed."
+msgstr ""
+
+#: shell/e-setup.c:187
+msgid "This seems to be the first time you run Evolution."
+msgstr ""
+
+#: shell/e-setup.c:188
+msgid "Please click \"OK\" to install the Evolution user files under"
+msgstr ""
+
+#: shell/e-setup.c:205
+#, c-format
+msgid ""
+"Cannot create the directory\n"
+"%s\n"
+"Error: %s"
+msgstr ""
+
+#: shell/e-setup.c:220
+#, c-format
+msgid ""
+"Cannot copy files into\n"
+"`%s'."
+msgstr ""
+
+#: shell/e-setup.c:245
+#, c-format
+msgid ""
+"The file `%s' is not a directory.\n"
+"Please move it in order to allow installation\n"
+"of the Evolution user files."
+msgstr ""
+
+#: shell/e-setup.c:257
+#, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:82
+#, c-format
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:134
+msgid "The specified folder name is not valid."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:225
+msgid "Evolution - Create new folder"
+msgstr ""
+
+#: shell/e-shell-folder-selection-dialog.c:96
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
+msgstr ""
+
+#: shell/e-shell-folder-selection-dialog.c:291
+#, fuzzy
+msgid "New..."
+msgstr "_Nua"
+
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+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:62
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr ""
 
 #. same as above
-#: shell/e-shell-view-menu.c:68
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:110
-msgid "Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view-menu.c:112
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:114
+#: shell/e-shell-view-menu.c:174
 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:163 shell/e-shell-view-menu.c:229
-msgid "_Folder"
+#: shell/e-shell-view-menu.c:335
+#, fuzzy
+msgid "Go to folder..."
+msgstr "SАbhАil 'san _fillteАn"
+
+#: shell/e-shell-view.c:140
+msgid "(No folder displayed)"
+msgstr ""
+
+#: shell/e-shell-view.c:455
+#, fuzzy
+msgid "Folders"
+msgstr "_FillteАn"
+
+#: shell/e-shell-view.c:1077
+#, fuzzy, c-format
+msgid "Evolution - %s"
+msgstr "Evolution"
+
+#: shell/e-shell.c:372
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1208
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:122
+msgid "Create new shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:125
+msgid "Group name:"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:234
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:239
+msgid "Don't remove"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:250
+msgid "_Small Icons"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:251
+msgid "Show the shortcuts as small icons"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:253
+msgid "_Large Icons"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:254
+msgid "Show the shortcuts as large icons"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:265
+msgid "_New Group..."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:266
+msgid "Create a new shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:268
+msgid "_Remove This Group..."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:269
+msgid "Remove this shortcut group"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:353
+msgid "Activate"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:353
+msgid "Activate this shortcut"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:356
+msgid "Remove this shortcut from the shortcut bar"
+msgstr ""
+
+#: shell/e-shortcuts.c:358
+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
+#, fuzzy
+msgid "_View"
+msgstr "_Nua"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr ""
+
+#: shell/e-storage.c:138
+msgid "(No name)"
+msgstr ""
+
+#: shell/e-storage.c:389
+msgid "No error"
+msgstr ""
+
+#: shell/e-storage.c:391
+msgid "Generic error"
+msgstr ""
+
+#: shell/e-storage.c:393
+msgid "A folder with the same name already exists"
+msgstr ""
+
+#: shell/e-storage.c:395
+msgid "The specified folder type is not valid"
+msgstr ""
+
+#: shell/e-storage.c:397
+msgid "I/O error"
+msgstr ""
+
+#: shell/e-storage.c:399
+msgid "Not enough space to create the folder"
+msgstr ""
+
+#: shell/e-storage.c:401
+msgid "The specified folder was not found"
+msgstr ""
+
+#: shell/e-storage.c:403
+msgid "Function not implemented in this storage"
+msgstr ""
+
+#: shell/e-storage.c:405
+msgid "Permission denied"
+msgstr ""
+
+#: shell/e-storage.c:407
+msgid "Operation not supported"
+msgstr ""
+
+#: shell/e-storage.c:409
+msgid "The specified type is not supported in this storage"
+msgstr ""
+
+#: shell/main.c:74
+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"
+"Evolution to read their mail full time. You could too. (Just\n"
+"be sure to keep a backup.)\n"
+"\n"
+"But while we have fixed many bugs affecting its stability and\n"
+"security, you still get the disclaimer:  Evolution will: crash,\n"
+"lose your mail when you don't want it to, refuse to delete your\n"
+"mail when you do want it to, leave stray processes running,\n"
+"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+"lists, and embarass you in front of your friends and co-workers.\n"
+"Use only as directed.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we eagerly\n"
+"await your contributions!\n"
+msgstr ""
+
+#: shell/main.c:101
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
+
+#: shell/main.c:132
+msgid "Cannot initialize the Evolution shell."
+msgstr ""
+
+#: shell/main.c:178
+msgid "Disable."
+msgstr ""
+
+#: shell/main.c:198
+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
+msgid "Create a new contact"
+msgstr ""
+
+#: po/tmp/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
+msgid "Find"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:11
+msgid "Find a contact"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "New"
+msgstr "_Nua"
+
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:16
+msgid "Stop Loading"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:17
+msgid "View All"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:18
+msgid "View all contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:19
+msgid "_Print Contacts..."
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+msgid "_Tools"
+msgstr "_UirlisМ"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-calendar.xml.h:6
+msgid "5 Days"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:7
+msgid "Alter preferences"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:8
+msgid "Ca_lendar"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:9
+msgid "Calendar Preferences..."
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:10
+msgid "Create a new appointment"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:11
+msgid "Create a new calendar"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:15
+msgid "Go to"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:16
+msgid "Go to a specific date"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:17
+msgid "Go to present time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:18
+msgid "Month"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+msgid "Next"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:21
+msgid "Open a calendar"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:22
+msgid "Prev"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:24
+msgid "Print this calendar"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+msgid "Today"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+msgid "_New"
+msgstr "_Nua"
+
+#: po/tmp/evolution-calendar.xml.h:33
+msgid "_Open Calendar"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:34
+msgid "_Print this calendar"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:35
+msgid "_Save Calendar As"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "Delete..."
+msgstr "ScrМos"
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+msgid "Help"
+msgstr ""
+
+#: po/tmp/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
+msgid "Print this item"
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/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
+#, 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
+msgid "Save and Close"
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
+msgstr ""
+
+#: po/tmp/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
+msgid "See online help"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "_File"
+msgstr "_FillteАn"
+
+#: po/tmp/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
+msgid "_Save"
+msgstr ""
+
+#.
+#. * 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
+msgid "About this application"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:7
+msgid "About..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:8
+msgid "Actio_ns"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
 msgstr "_FillteАn"
 
-#: shell/e-shell-view-menu.c:167
-msgid "Evolution _Bar Shortcut"
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "Gearr"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+msgid "Clear"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:12
+msgid "Clear the selection"
+msgstr ""
+
+#: po/tmp/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
+msgid "Copy"
+msgstr "Greamaigh"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "Gearr"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:28
+msgid "FIXME: Define Print _Styles"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:31
+#, fuzzy
+msgid "FIXME: For_ward"
+msgstr "Sheoladh Chuig duine"
+
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:38
+msgid "FIXME: Print Pre_view"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:173
-msgid "_Mail message"
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:43
+msgid "FIXME: Save Attac_hments..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:50
+msgid "FIXME: _Formatting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:54
+#, fuzzy
+msgid "FIXME: _Mail Message"
 msgstr "_Post sceАl"
 
-#: shell/e-shell-view-menu.c:174 shell/e-shell-view-menu.c:177
-msgid "Composes a new mail message"
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:176
-msgid "_Appointment"
+#: po/tmp/evolution-event-editor.xml.h:56
+msgid "FIXME: _Move to Folder..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:57
+#, fuzzy
+msgid "FIXME: _New Appointment"
 msgstr "_Coinne"
 
-#: shell/e-shell-view-menu.c:179
-msgid "Meeting Re_quest"
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:182
-msgid "_Contact"
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:185
-msgid "_Task"
-msgstr "_Teacs"
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:188
-msgid "Task _Request"
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:191
-msgid "_Journal Entry"
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:194
-msgid "_Note"
-msgstr "_Nota"
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:204
-msgid "_Selected Items"
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:212
-msgid "_New Folder"
+#: po/tmp/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
+msgid "F_ormat"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:73
+msgid "N_ext"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:77
+msgid "Pre_vious"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:78
+msgid "Previous"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:79
+msgid "Print S_etup..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:80
+#, fuzzy
+msgid "Print Setup"
+msgstr "PriontАil"
+
+#: po/tmp/evolution-event-editor.xml.h:83
+msgid "Properties"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "ScrМos"
+
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "Freagrair"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
+
+#: po/tmp/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
+msgid "Save the current file"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:99
+msgid "Select All"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:100
+msgid "Select everything"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr "LeasЗ"
+
+#: po/tmp/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
+msgid "_About..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+msgid "_Close"
+msgstr ""
+
+#: po/tmp/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
+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
+msgid "_Edit"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:111
+msgid "_Find..."
+msgstr ""
+
+#: po/tmp/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
+msgid "_Help"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:115
+#, fuzzy
+msgid "_Object"
+msgstr "Abair"
+
+#: po/tmp/evolution-event-editor.xml.h:116
+msgid "_Paste"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:117
+#, fuzzy
+msgid "_Print"
+msgstr "PriontАil"
+
+#: po/tmp/evolution-event-editor.xml.h:118
+msgid "_Properties..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:119
+msgid "_Redo"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:122
+#, fuzzy
+msgid "_Toolbars"
+msgstr "_UirlisМ"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+#, fuzzy
+msgid "_Undo"
+msgstr "LeasЗ"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
+msgid "Compose"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:7
+msgid "Compose a new message"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "F_older"
+msgstr "_FillteАn"
+
+#: po/tmp/evolution-mail.xml.h:14
+msgid "Fi_lter on Sender"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:15
+msgid "Filter on Rec_ipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:20
+msgid "Get Mail"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:21
+msgid "Mail _Filters"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:22
+msgid "Manage Subscriptions"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Mar_k As Read"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:24
+msgid "Mark As U_nread"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Move"
+msgstr "ScrМos"
+
+#: po/tmp/evolution-mail.xml.h:26
+msgid "Move message to a new folder"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:27
+msgid "Previews the message to be printed"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:29
+msgid "Print Preview of message..."
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Print message..."
+msgstr "Post an sceАl seo"
+
+#: po/tmp/evolution-mail.xml.h:35
+msgid "Reply to _All"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:36
+msgid "Reply to _Sender"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+msgid "Select _All"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:41
+msgid "Threaded Message list"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:42
+msgid "VFolder on Se_nder"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:43
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
+msgid "_Apply Filters"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:46
+#, fuzzy
+msgid "_Configure Folder"
 msgstr "FillteАn _Nua"
 
-#: shell/e-shell-view-menu.c:220
-msgid "_New"
-msgstr "_Nua"
+#: po/tmp/evolution-mail.xml.h:47
+msgid "_Copy to Folder..."
+msgstr ""
 
-#: shell/e-shell-view-menu.c:221
-msgid "_Open"
+#: po/tmp/evolution-mail.xml.h:49
+#, fuzzy
+msgid "_Edit Message"
+msgstr "_Post sceАl"
+
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:51
+msgid "_Filter on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:52
+#, fuzzy
+msgid "_Forward"
+msgstr "Sheoladh Chuig duine"
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:55
+#, fuzzy
+msgid "_Message"
+msgstr "_Post sceАl"
+
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "SАbhАil 'san _fillteАn"
+
+#: po/tmp/evolution-mail.xml.h:57
+msgid "_Open in New Window"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Print Message"
+msgstr "_Post sceАl"
+
+#: po/tmp/evolution-mail.xml.h:59
+msgid "_Save Message As..."
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:60
+msgid "_Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "ScrМos"
+
+#: po/tmp/evolution-mail.xml.h:63
+msgid "_VFolder on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
+msgstr ""
+
+#.
+#. * 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
+msgid "Attach"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:9
+msgid "Close the current file"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:12
+msgid "Insert a file as text into the message"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert text file..."
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:15
+msgid "Open a file"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:17
+msgid "Save As"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "SАbhАil 'san _fillteАn"
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "SАbhАil 'san _fillteАn"
+
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Post"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+msgid "Send _Later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:26
+msgid "Send _later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send the mail in HTML format"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Post an sceАl seo"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "Post an sceАl seo"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Post an sceАl seo"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+msgid "Show / hide attachments"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:32
+msgid "Show _attachments"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:33
+msgid "Show attachments"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
 msgstr "_OscАil"
 
-#: shell/e-shell-view-menu.c:222
-msgid "Clos_e All Items"
-msgstr "_DЗn gach rud"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:222
-msgid "Closes all the open items"
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:243
-msgid "_Toggle Shortcut Bar"
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:244
-msgid "Toggles the shortcut bar"
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:246
-msgid "_Toggle Treeview"
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:247
-msgid "Toggles the tree view"
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:262
-msgid "_Submit bug"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:263
-msgid "Submit bug-report via bug-buddy"
+#: po/tmp/evolution.xml.h:7
+msgid "E_xit"
 msgstr ""
 
-#. FIXME: add Favorites here
-#: shell/e-shell-view-menu.c:278
-msgid "_Tools"
-msgstr "_UirlisМ"
+#: po/tmp/evolution.xml.h:8
+msgid "Evolution bar _shortcut"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:279
-msgid "_Actions"
+#: po/tmp/evolution.xml.h:9
+msgid "Exit the program"
 msgstr ""
 
-#: shell/e-shell.c:82
-#, c-format
-msgid "Cannot set up local storage -- %s"
+#: po/tmp/evolution.xml.h:10
+msgid "Getting _Started"
 msgstr ""
 
-#: shell/main.c:111
-msgid "Cannot initialize the Bonobo component system."
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
 msgstr ""
 
-#: shell/main.c:126
-msgid "Cannot initialize the Evolution shell."
+#: po/tmp/evolution.xml.h:12
+msgid "Show the _Folder Bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:13
+msgid "Show the _Shortcut Bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:14
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: po/tmp/evolution.xml.h:16
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:17
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:18
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:19
+msgid "Using the _Calendar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:21
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution"
+
+#: po/tmp/evolution.xml.h:22
+#, fuzzy
+msgid "_Appointment (FIXME)"
+msgstr "_Coinne"
+
+#: po/tmp/evolution.xml.h:23
+msgid "_Contact (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:26
+msgid "_Folder"
+msgstr "_FillteАn"
+
+#: po/tmp/evolution.xml.h:27
+#, fuzzy
+msgid "_Go to Folder..."
+msgstr "_FillteАn"
+
+#: po/tmp/evolution.xml.h:29
+msgid "_Index"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:30
+#, fuzzy
+msgid "_Mail message (FIXME)"
+msgstr "_Post sceАl"
+
+#: po/tmp/evolution.xml.h:32
+msgid "_Settings"
+msgstr ""
+
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+msgid "Busy"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+msgid "Out of Office"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
+msgid "No Information"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
+msgid "_Invite Others..."
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
+#, fuzzy
+msgid "_Options"
+msgstr "_OscАil"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
+msgid "Show _Only Working Hours"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
+msgid "Show _Zoomed Out"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
+msgid "_Update Free/Busy"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
+msgid "_<<"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
+msgid "_Autopick"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
+msgid ">_>"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
+msgid "_All People and Resources"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
+msgid "All _People and One Resource"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
+msgid "_Required People"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
+msgid "Required People and _One Resource"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
+msgid "Meeting _start time:"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
+msgid "Meeting _end time:"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
+msgid "All Attendees"
+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
+msgid "%B %Y"
 msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr ""
+
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr ""
+
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
+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
+msgid "%I:%M %p"
+msgstr ""
+
+#: widgets/shortcut-bar/e-group-bar.c:632
+#, c-format
+msgid "Group %i"
+msgstr ""
+
+#~ msgid "Clos_e All Items"
+#~ msgstr "_DЗn gach rud"
diff --git a/po/gl.po b/po/gl.po
index 046c0a85df..86061dc9f7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2000-11-05 16:06+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -18,11 +18,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3044
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3048
 msgid ""
 "\n"
 "Name: "
@@ -30,7 +30,7 @@ msgstr ""
 "\n"
 "Nome: "
 
-#: addressbook/backend/ebook/e-card.c:3047
+#: addressbook/backend/ebook/e-card.c:3049
 msgid ""
 "\n"
 "  Prefix:     "
@@ -38,25 +38,25 @@ msgstr ""
 "\n"
 "  Prefixo:    "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3050
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Suffix:     "
@@ -64,7 +64,7 @@ msgstr ""
 "\n"
 "  Sufixo:     "
 
-#: addressbook/backend/ebook/e-card.c:3065
+#: addressbook/backend/ebook/e-card.c:3067
 msgid ""
 "\n"
 "Birth Date: "
@@ -72,7 +72,7 @@ msgstr ""
 "\n"
 "Data de Nacemento: "
 
-#: addressbook/backend/ebook/e-card.c:3076
+#: addressbook/backend/ebook/e-card.c:3078
 msgid ""
 "\n"
 "Address:"
@@ -80,7 +80,7 @@ msgstr ""
 "\n"
 "Enderezo:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3080
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -88,13 +88,13 @@ msgstr ""
 "\n"
 "  Apdo. de Correos: "
 
-#: addressbook/backend/ebook/e-card.c:3079
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3082
 msgid ""
 "\n"
 "  Street:      "
@@ -102,7 +102,7 @@ msgstr ""
 "\n"
 "  RЗa:         "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  City:        "
@@ -110,7 +110,7 @@ msgstr ""
 "\n"
 "  Cidade:      "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
@@ -118,7 +118,7 @@ msgstr ""
 "\n"
 "  RexiСn:      "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
@@ -126,7 +126,7 @@ msgstr ""
 "\n"
 "  CСdigo Postal: "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
@@ -134,13 +134,13 @@ msgstr ""
 "\n"
 "  PaМs:        "
 
-#: addressbook/backend/ebook/e-card.c:3097
+#: addressbook/backend/ebook/e-card.c:3099
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3109
+#: addressbook/backend/ebook/e-card.c:3111
 msgid ""
 "\n"
 "Telephones:\n"
@@ -148,7 +148,7 @@ msgstr ""
 "\n"
 "TelИfonos:\n"
 
-#: addressbook/backend/ebook/e-card.c:3112
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
@@ -156,7 +156,7 @@ msgstr ""
 "\n"
 "TelИfono:"
 
-#: addressbook/backend/ebook/e-card.c:3136
+#: addressbook/backend/ebook/e-card.c:3138
 msgid ""
 "\n"
 "E-mail:\n"
@@ -164,7 +164,7 @@ msgstr ""
 "\n"
 "Correo ElectrСnico:\n"
 
-#: addressbook/backend/ebook/e-card.c:3139
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:"
@@ -172,13 +172,13 @@ msgstr ""
 "\n"
 "Correo ElectrСnico:"
 
-#: addressbook/backend/ebook/e-card.c:3158
+#: addressbook/backend/ebook/e-card.c:3160
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3164
+#: addressbook/backend/ebook/e-card.c:3166
 msgid ""
 "\n"
 "Time Zone: "
@@ -186,25 +186,25 @@ msgstr ""
 "\n"
 "Zona Horaria: "
 
-#: addressbook/backend/ebook/e-card.c:3172
+#: addressbook/backend/ebook/e-card.c:3174
 msgid ""
 "\n"
 "Geo Location: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3176
+#: addressbook/backend/ebook/e-card.c:3178
 msgid ""
 "\n"
 "Business Role: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3188
+#: addressbook/backend/ebook/e-card.c:3190
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3189
+#: addressbook/backend/ebook/e-card.c:3191
 msgid ""
 "\n"
 "  Name:  "
@@ -212,31 +212,31 @@ msgstr ""
 "\n"
 "  Nome:  "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3192
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "Categories: "
@@ -244,7 +244,7 @@ msgstr ""
 "\n"
 "CategorМas: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "Comment: "
@@ -262,13 +262,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Public Key: "
@@ -280,10 +280,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:910
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1091
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
@@ -408,28 +408,28 @@ msgstr ""
 "Ocorreu un erro С obter a lista de\n"
 "pilots do demo gnome-pilot"
 
-#: addressbook/conduit/address-conduit.c:193
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "Non foi posible cargar o cursor\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EBook non cargado\n"
 
-#: addressbook/conduit/address-conduit.c:490
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Non foi posible iniciar o servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:491
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Non foi posible iniciar wombat"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -450,114 +450,11 @@ msgstr "Elemento(s) pertencentes a estas categorМas:"
 msgid "Available Categories:"
 msgstr "CategorМas DispoЯibles:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr "Asistente"
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr "Traballo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr "Traballo 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr "Fax do Traballo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr "AutomСbil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr "CompaЯМa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr "Particular"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr "Particular 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr "Fax Particular"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr "RDSI"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr "MСbil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28 mail/mail-config.glade.h:40
-msgid "Other"
-msgstr "Outro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr "Outro Fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr "Localizador (Pager)"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr "Correo ElectrСnico Principal"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr "Correo ElectrСnico 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-msgstr "Correo ElectrСnico 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"©EstА seguro de que quere\n"
-"borrar este contacto?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:10
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "©Borrar Contacto?"
 
@@ -571,7 +468,7 @@ msgid "_Add"
 msgstr "_Engadir"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.xml.h:109 ui/evolution-mail.xml.h:46
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -584,13 +481,13 @@ msgstr "Tipos de TelИfono"
 msgid "New phone type"
 msgstr "Novo tipo de telИfono"
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:71
-#: calendar/gui/event-editor-dialog.glade.h:80 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: filter/filter.glade.h:26 mail/mail-config-druid.glade.h:22
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22 mail/mail-config.glade.h:29
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Engadir"
 
@@ -630,6 +527,11 @@ msgstr "_Fax do Traballo"
 msgid "_Mobile"
 msgstr "_MСbil"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Correo ElectrСnico Principal"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "T_raballo"
@@ -643,8 +545,7 @@ msgid "C_ontacts..."
 msgstr "C_ontactos..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:34
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ca_tegorМas..."
 
@@ -661,8 +562,7 @@ msgid "_Address..."
 msgstr "_Enderezo..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:87
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Xeral"
 
@@ -707,68 +607,146 @@ msgid "No_tes:"
 msgstr "No_tas:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:36
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detalles"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Asistente"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Traballo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Traballo 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Fax do Traballo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "AutomСbil"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "CompaЯМa"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Particular"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Particular 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Fax Particular"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "RDSI"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Outro"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Outro Fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Localizador (Pager)"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "Correo ElectrСnico 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "Correo ElectrСnico 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
-#: addressbook/contact-editor/fulladdr.glade.h:19
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "Enderezo _2:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "CanadА"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
-#: addressbook/contact-editor/fulladdr.glade.h:21
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "_PaМs:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Finlandia"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "Estados Unidos"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
-#: addressbook/contact-editor/fulladdr.glade.h:22
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Cidade:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-#: addressbook/contact-editor/fulladdr.glade.h:23
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Apdo. de Correos:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-#: addressbook/contact-editor/fulladdr.glade.h:18
-msgid "Address _2:"
-msgstr "Enderezo _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
-#: addressbook/contact-editor/fulladdr.glade.h:24
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "E_stado/Provincia:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "Estados Unidos"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "CanadА"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Finlandia"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
-#: addressbook/contact-editor/fulladdr.glade.h:25
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "CСdigo _Postal:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-#: addressbook/contact-editor/fulladdr.glade.h:20
-msgid "Countr_y:"
-msgstr "_PaМs:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -832,17 +810,16 @@ msgstr "_Apelidos:"
 msgid "_Suffix:"
 msgstr "_Sufixo:"
 
-#: addressbook/gui/component/addressbook.c:265
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Como _Minitarxetas"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:271
-#: ui/evolution-addressbook.xml.h:7
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Como unha _TАboa"
 
@@ -859,10 +836,34 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#, fuzzy
+msgid "Show All"
+msgstr "Ver Todos"
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:574
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "O corpo contИn"
+
+#: addressbook/gui/component/addressbook.c:534
+#, fuzzy
+msgid "Name contains"
+msgstr "contИn"
+
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "contИn"
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que amosarА o navegador de carpetas"
 
@@ -871,185 +872,169 @@ msgid "External Directories"
 msgstr "Directorios Externos"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: addressbook/gui/component/ldap-server-dialog.glade.h:12
-#: composer/e-msg-composer-attachment.glade.h:9
-#: composer/e-msg-composer-attachment.glade.h:12
+#: 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/ldap-server-dialog.glade.h:8
-#: addressbook/gui/component/ldap-server-dialog.glade.h:13
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "Servidor LDAP:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-#: addressbook/gui/component/ldap-server-dialog.glade.h:15
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "Nome:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "NЗmero de Porto:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-#: addressbook/gui/component/ldap-server-dialog.glade.h:16
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr "DN RaМz:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: addressbook/gui/component/ldap-server-dialog.glade.h:14
-#: mail/mail-config-druid.glade.h:49
-msgid "Name:"
-msgstr "Nome:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-#: addressbook/gui/component/select-names/select-names.glade.h:13
-msgid "Select Names"
-msgstr ""
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-#: addressbook/gui/component/select-names/select-names.glade.h:11
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Buscar..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-#: addressbook/gui/component/select-names/select-names.glade.h:14
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr ""
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr ""
+
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Seleccionar un nome da Lista:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-#: addressbook/gui/component/select-names/select-names.glade.h:12
-msgid "Message Recipients"
-msgstr ""
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Buscar"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-#: addressbook/gui/widgets/alphabet.glade.h:36
-msgid "window2"
-msgstr "window2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
-#: addressbook/gui/widgets/alphabet.glade.h:35
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Gardar como VCard"
 
@@ -1071,240 +1056,187 @@ msgstr ""
 "\n"
 "Faga dobre clic aquМ para crear un novo Contacto."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:643 mail/mail-search-dialogue.c:101
-msgid "Search"
-msgstr "Buscar"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-#: addressbook/printing/e-contact-print.glade.h:82
-msgid "Page Setup:"
-msgstr "ConfiguraciСn da PАxina:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 ptos. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:8
-#: addressbook/printing/e-contact-print.glade.h:94
-msgid "Style name:"
-msgstr "Nome do estilo:"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 ptos. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:9
-#: addressbook/printing/e-contact-print.glade.h:86
-msgid "Preview:"
-msgstr "PrevisualizaciСn:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:10
-#: addressbook/printing/e-contact-print.glade.h:79
-msgid "Options"
-msgstr "OpciСns"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Corpo"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-#: addressbook/printing/e-contact-print.glade.h:73
-msgid "Include:"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Inferior:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
-#: addressbook/printing/e-contact-print.glade.h:90
-msgid "Sections:"
-msgstr "SecciСns:"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "DimensiСns:"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-#: addressbook/printing/e-contact-print.glade.h:72
-msgid "Immediately follow each other"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Fonte..."
 
-#: addressbook/printing/e-contact-print.glade.h:14
-#: addressbook/printing/e-contact-print.glade.h:76
-msgid "Letter tabs on side"
-msgstr "Pestanas coas letras no lateral"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "Fontes"
 
-#: addressbook/printing/e-contact-print.glade.h:15
-#: addressbook/printing/e-contact-print.glade.h:70
-msgid "Headings for each letter"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:16
-#: addressbook/printing/e-contact-print.glade.h:93
-msgid "Start on a new page"
-msgstr "Iniciar nunha nova pАxina"
-
-#: addressbook/printing/e-contact-print.glade.h:17
-#: addressbook/printing/e-contact-print.glade.h:78
-msgid "Number of columns:"
-msgstr "NЗmero de columnas:"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Formato"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-#: addressbook/printing/e-contact-print.glade.h:59
-msgid "Blank forms at end:"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:19
-#: addressbook/printing/e-contact-print.glade.h:64
-msgid "Fonts"
-msgstr "Fontes"
-
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-#: addressbook/printing/e-contact-print.glade.h:63
-msgid "Font..."
-msgstr "Fonte..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:22
-#: addressbook/printing/e-contact-print.glade.h:69
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Cabeceiras"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-#: addressbook/printing/e-contact-print.glade.h:57
-msgid "10 pt. Tahoma"
-msgstr "10 ptos. Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:24
-#: addressbook/printing/e-contact-print.glade.h:60
-msgid "Body"
-msgstr "Corpo"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "Altura:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-#: addressbook/printing/e-contact-print.glade.h:58
-msgid "8 pt. Tahoma"
-msgstr "8 ptos. Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:26
-#: addressbook/printing/e-contact-print.glade.h:91
-msgid "Shading"
-msgstr "Sombreado"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:27
-#: addressbook/printing/e-contact-print.glade.h:87
-msgid "Print using gray shading"
-msgstr "Imprimir usando sombreado gris"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Horizontal"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-#: addressbook/printing/e-contact-print.glade.h:66
-msgid "Format"
-msgstr "Formato"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Esquerda:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-#: addressbook/printing/e-contact-print.glade.h:83
-msgid "Paper"
-msgstr "Papel"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "Pestanas coas letras no lateral"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-#: addressbook/printing/e-contact-print.glade.h:96
-#: mail/mail-config-druid.glade.h:78
-msgid "Type:"
-msgstr "Tipo:"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Marxes"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: addressbook/printing/e-contact-print.glade.h:98
-msgid "label26"
-msgstr "label26"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "NЗmero de columnas:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-#: addressbook/printing/e-contact-print.glade.h:62
-msgid "Dimensions:"
-msgstr "DimensiСns:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "OpciСns"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-#: addressbook/printing/e-contact-print.glade.h:97
-msgid "Width:"
-msgstr "Largura:"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "OrientaciСn"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-#: addressbook/printing/e-contact-print.glade.h:71
-msgid "Height:"
-msgstr "Altura:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "PАxina"
+
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "ConfiguraciСn da PАxina:"
 
-#: addressbook/printing/e-contact-print.glade.h:35
-#: addressbook/printing/e-contact-print.glade.h:84
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Papel"
+
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Orixe do papel:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-#: addressbook/printing/e-contact-print.glade.h:77
-msgid "Margins"
-msgstr "Marxes"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "Vertical"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-#: addressbook/printing/e-contact-print.glade.h:95
-msgid "Top:"
-msgstr "Superior:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "PrevisualizaciСn:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-#: addressbook/printing/e-contact-print.glade.h:61
-msgid "Bottom:"
-msgstr "Inferior:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "Imprimir usando sombreado gris"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-#: addressbook/printing/e-contact-print.glade.h:75
-msgid "Left:"
-msgstr "Esquerda:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "Invertir nas pАxinas pares"
 
-#: addressbook/printing/e-contact-print.glade.h:40
-#: addressbook/printing/e-contact-print.glade.h:89
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Dereita:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-#: addressbook/printing/e-contact-print.glade.h:81
-msgid "Page"
-msgstr "PАxina"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "SecciСns:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
-#: addressbook/printing/e-contact-print.glade.h:92
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "Sombreado"
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "TamaЯo:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-#: addressbook/printing/e-contact-print.glade.h:80
-msgid "Orientation"
-msgstr "OrientaciСn"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-#: addressbook/printing/e-contact-print.glade.h:85
-msgid "Portrait"
-msgstr "Vertical"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "Iniciar nunha nova pАxina"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-#: addressbook/printing/e-contact-print.glade.h:74
-msgid "Landscape"
-msgstr "Horizontal"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Nome do estilo:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-#: addressbook/printing/e-contact-print.glade.h:67
-msgid "Header"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Superior:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-#: addressbook/printing/e-contact-print.glade.h:65
-msgid "Footer:"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Tipo:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-#: addressbook/printing/e-contact-print.glade.h:88
-msgid "Reverse on even pages"
-msgstr "Invertir nas pАxinas pares"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Largura:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-#: addressbook/printing/e-contact-print.glade.h:68
-msgid "Header/Footer"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "label26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
@@ -1316,13 +1248,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:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Erro comunicando co servidor de axenda"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -1334,8 +1266,8 @@ 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:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1379,49 +1311,46 @@ msgstr ""
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Ficheiro non atopado"
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Abrir axenda"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Gardar axenda"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "PЗblico"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Confidencial"
 
@@ -1453,7 +1382,7 @@ msgstr "Transparente"
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1465,36 +1394,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr "%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:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1504,15 +1432,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A porcentaxe ten que ser un valor entre 0 e 100, inclusive"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "A prioridade ten que estar entre 1 e 9, inclusive"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "O URI que amosarА a axenda"
 
@@ -1529,540 +1457,459 @@ msgid "No summary available."
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/dialogs/alarm-notify.glade.h:11
-#: ui/evolution-contact-editor.xml.h:7 ui/evolution-event-editor.xml.h:14
-#: ui/evolution-subscribe.xml.h:8
+#: 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
 msgid "Close"
 msgstr "Pechar"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8
-#: calendar/gui/dialogs/alarm-notify.glade.h:13 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Adiar"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
-#: calendar/gui/dialogs/alarm-notify.glade.h:12
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Editar cita"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
-#: calendar/gui/dialogs/alarm-notify.glade.h:14
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Adiar"
+
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Tempo de adiamento (minutos)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:74
-msgid "Calendar Preferences"
-msgstr "Preferencias da Axenda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:111
-msgid "Work week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:90
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Lun"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:108
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Mar"
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:110
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "MИr"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:104
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Xov"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 horas (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:84
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Ven"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:97
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "SАb"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 horas"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:102
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:83
-msgid "First day of week:"
-msgstr "Primeiro dМa da semana:"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Luns"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Tuesday"
-msgstr "Martes"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "Alarmas Sonoras"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Wednesday"
-msgstr "MИrcores"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "Thursday"
-msgstr "Xoves"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Axenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "Friday"
-msgstr "Venres"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "Preferencias da Axenda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "Saturday"
-msgstr "SАbado"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Cores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Domingo"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:101
-msgid "Start of day:"
-msgstr "Inicio do dМa:"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:82
-msgid "End of day:"
-msgstr "Final do dМa:"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:79
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:106
-msgid "Time divisions:"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:107
-msgid "Time format:"
-msgstr "Formato da hora:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:99
-msgid "Show appointment end times"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
-msgid "Compress weekends"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Final do dМa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:68
-msgid "12 hour (am/pm)"
-msgstr "12 horas (am/pm)"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "Primeiro dМa da semana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
-msgid "24 hour"
-msgstr "24 horas"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 minutos"
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Venres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 minutos"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 minutos"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 minutos"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 minutos"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
-msgid "Date navigator options"
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:100
-msgid "Show week numbers"
-msgstr "Amosar nЗmeros de semana"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
-msgid "Calendar"
-msgstr "Axenda"
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Luns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:98
-msgid "Show"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:80 calendar/gui/prop.c:610
-msgid "Due Date"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:105 calendar/gui/prop.c:612
-msgid "Time Until Due"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:94 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Prioridade"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:85
-msgid "Highlight"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:91
-msgid "Overdue Items"
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:86
-msgid "Items Due Today"
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:88
-msgid "Items Not Yet Due"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "SАb"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:75 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Cores"
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "SАbado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:93
-msgid "Pick a color"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:89
-msgid "Items Not Yet Due:"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:87
-msgid "Items Due Today:"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "Amosar nЗmeros de semana"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:92
-msgid "Overdue Items:"
-msgstr ""
+#: po/tmp/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
+msgid "Sun"
+msgstr "Dom"
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:103
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:78 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "Xov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:95
-msgid "Remind me of all appointments"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Xoves"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:112
-msgid "minutes before they occur."
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:109
+#: po/tmp/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
+msgid "Tue"
+msgstr "Mar"
+
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Martes"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Alarmas Visuais"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:72
-msgid "Beep when alarm windows appear."
-msgstr ""
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "MИr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
-msgid "Audio Alarms"
-msgstr "Alarmas Sonoras"
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "MИrcores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
-msgid "Alarms timeout after"
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:113
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr "segundos."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:81
-msgid "Enable snoozing for"
-msgstr ""
+#.
+#. * 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
+msgid "% Comp_lete:"
+msgstr "% Comp_leta:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:96
-msgid "Reminders"
-msgstr ""
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "C_lasificaciСn:"
 
-#: calendar/gui/dialogs/task-editor.c:655
-msgid "Edit Task"
-msgstr "Editar Tarefa"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "Cancelada"
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:302
-msgid "No summary"
-msgstr "Sen resume"
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
+msgstr "Completada"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:308
-#, c-format
-msgid "Appointment - %s"
-msgstr "Cita - %s"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:311
-#, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
+msgstr "Alta"
 
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:314
-#, c-format
-msgid "Journal entry - %s"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "En Progreso"
+
+#: po/tmp/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
+msgid "None"
 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.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:45
-msgid "task-editor-dialog"
-msgstr "diАlogo-editor-tarefas"
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Normal"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:37
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Non Iniciada"
+
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "_Resume"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:38
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:42
-msgid "_Due Date:"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
-msgid "% Comp_lete:"
-msgstr "% Comp_leta:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:44
-msgid "_Status:"
-msgstr "_Estado:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Non Iniciada"
+#: po/tmp/task-editor-dialog.glade.h:24
+msgid "Task"
+msgstr "Tarefa"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "En Progreso"
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
-msgstr "Completada"
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "_Contactos..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Cancelada"
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:43
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Prioridade:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "High"
-msgstr "Alta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Normal"
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "_Estado:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Low"
-msgstr "Baixa"
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr "diАlogo-editor-tarefas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
-msgid "C_lassification:"
-msgstr "C_lasificaciСn:"
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Editar Tarefa"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: shell/e-shell-view.c:1017 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Sen resume"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:41
-msgid "_Contacts..."
-msgstr "_Contactos..."
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:39
-msgid "Task"
-msgstr "Tarefa"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:35
-msgid "Date Completed:"
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:40
-msgid "URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:294
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Abrir..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Abrir a tarefa"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Marcar como Completa"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Marcar a tarefa como completa"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:73
-#: calendar/gui/event-editor-dialog.glade.h:84 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/filter.glade.h:27 filter/libfilter-i18n.h:8
-#: mail/mail-config-druid.glade.h:35 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-config.glade.h:31 mail/mail-view.c:165
-#: ui/evolution-addressbook.xml.h:9 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-event-editor.xml.h:20 ui/evolution-mail.xml.h:11
+#: 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:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Borrar a tarefa"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: 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
 msgid "New appointment..."
 msgstr "Nova cita..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
-#: ui/evolution-event-editor.xml.h:21
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -2073,279 +1920,203 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d de %b"
 
-#: calendar/gui/event-editor.c:296
-msgid "Edit Appointment"
-msgstr "Editar Cita"
-
-#: calendar/gui/event-editor.c:341
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:469
-msgid "ocurrences"
-msgstr ""
-
-#: calendar/gui/event-editor.c:2358 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a, %d de %b de %Y"
-
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
 #.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/event-editor-dialog.glade.h:7
-#: calendar/gui/event-editor-dialog.glade.h:112
-msgid "event-editor-dialog"
-msgstr "diАlogo-editor-eventos"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/event-editor-dialog.glade.h:98
-msgid "Su_mmary:"
-msgstr "_Resume:"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:102
-msgid "Time"
-msgstr "Hora"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-#: calendar/gui/event-editor-dialog.glade.h:110
-msgid "_Start time:"
-msgstr "Hora de _comezo:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-#: calendar/gui/event-editor-dialog.glade.h:106
-msgid "_End time:"
-msgstr "Hora de _finalizaciСn:"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:79
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "Evento de dМa _completo"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-#: calendar/gui/event-editor-dialog.glade.h:82
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "ClasificaciСn"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-#: calendar/gui/event-editor-dialog.glade.h:92
-msgid "Pu_blic"
-msgstr "PЗ_blico"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:91
-msgid "Pri_vate"
-msgstr "Pri_vado"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "DМas"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-#: calendar/gui/event-editor-dialog.glade.h:104
-msgid "_Confidential"
-msgstr "_Confidencial"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Cada"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minutos"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "ExcepciСns"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: po/tmp/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "DМas"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Enviar _a:"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-#: calendar/gui/event-editor-dialog.glade.h:105
-msgid "_Display"
-msgstr "_Visualizar"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minutos"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-#: calendar/gui/event-editor-dialog.glade.h:108
-msgid "_Program"
-msgstr "_Programa"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-#: calendar/gui/event-editor-dialog.glade.h:107
-msgid "_Mail"
-msgstr "_Correo"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "Mail _to:"
-msgstr "Enviar _a:"
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "PrevisualizaciСn:"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-#: calendar/gui/event-editor-dialog.glade.h:109
-msgid "_Run program:"
-msgstr "_Executar programa:"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Pri_vado"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-#: calendar/gui/event-editor-dialog.glade.h:103
-msgid "_Audio"
-msgstr "_Audio"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "PЗ_blico"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-#: calendar/gui/event-editor-dialog.glade.h:96
-msgid "Reminder"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:38
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "Recur on the"
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-#: calendar/gui/event-editor-dialog.glade.h:115
-msgid "th day of the month"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
-msgid "1st"
-msgstr "1"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr "_Resume:"
 
-#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Hora"
 
-#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
-msgid "4th"
-msgstr "4"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "_Audio"
 
-#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
-msgid "5th"
-msgstr "5"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "_Confidencial"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:62
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Every"
-msgstr "Cada"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr "_Visualizar"
 
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:65
-#: calendar/gui/event-editor-dialog.glade.h:114
-msgid "month(s)"
-msgstr "mes(es)"
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "Hora de _finalizaciСn:"
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:78
-#: calendar/gui/event-editor-dialog.glade.h:94
-msgid "Recurrence"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "_Correo"
 
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/event-editor-dialog.glade.h:81
-msgid "Appointment Basics"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Programa"
+
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "_Executar programa:"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/event-editor-dialog.glade.h:111
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "Hora de _comezo:"
+
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Data de _comezo:"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/event-editor-dialog.glade.h:95
-msgid "Recurrence Rule"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "dМa(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/event-editor-dialog.glade.h:90
-msgid "No recurrence"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "diАlogo-editor-eventos"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-#: calendar/gui/event-editor-dialog.glade.h:97
-msgid "Simple recurrence"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "Custom recurrence"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "day(s)"
-msgstr "dМa(s)"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:64
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "mes(es)"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "semana(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:66
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "ano(s)"
 
-#: calendar/gui/event-editor-dialog.glade.h:67
-msgid "for"
-msgstr ""
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Editar Cita"
 
-#: calendar/gui/event-editor-dialog.glade.h:68
-msgid "until"
+#: calendar/gui/event-editor.c:407
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:69
-msgid "forever"
-msgstr ""
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dМa"
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "Exceptions"
-msgstr "ExcepciСns"
+#: calendar/gui/event-editor.c:559
+#, fuzzy
+msgid "on the"
+msgstr "mes"
 
-#: calendar/gui/event-editor-dialog.glade.h:72
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "Modify"
-msgstr ""
+#: calendar/gui/event-editor.c:566
+#, fuzzy
+msgid "th"
+msgstr "4"
 
-#: calendar/gui/event-editor-dialog.glade.h:74
-#: calendar/gui/event-editor-dialog.glade.h:113
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
+msgstr "Fontes"
 
-#: calendar/gui/event-editor-dialog.glade.h:75
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:99
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution."
-msgstr ""
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a, %d de %b de %Y"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2459,10 +2230,6 @@ msgstr "quincena"
 msgid "week"
 msgstr "semana"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dМa"
-
 #: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "hora"
@@ -2561,53 +2328,29 @@ msgstr "dИcimo segundo"
 msgid "ago"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Prioridade:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: 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:1144
+#: 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/gnome-cal.c:1155
+#: 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/gnome-cal.c:1166
+#: 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"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
-#: mail/mail-search-dialogue.c:101
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -2633,6 +2376,26 @@ msgstr ""
 msgid "Go to today"
 msgstr "Ir a hoxe"
 
+#: calendar/gui/print.c:288
+msgid "1st"
+msgstr "1"
+
+#: calendar/gui/print.c:288
+msgid "2nd"
+msgstr "2"
+
+#: calendar/gui/print.c:288
+msgid "3rd"
+msgstr "3"
+
+#: calendar/gui/print.c:288
+msgid "4th"
+msgstr "4"
+
+#: calendar/gui/print.c:288
+msgid "5th"
+msgstr "5"
+
 #: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6"
@@ -2802,185 +2565,93 @@ msgstr "Ano actual (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir axenda"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:834
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Previsualizar da ImpresiСn"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr ""
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Formato da hora"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 horas (AM/PM)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 horas"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "A semana comeza o"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr ""
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr ""
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr ""
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr ""
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr ""
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr ""
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr ""
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr ""
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr ""
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr ""
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr ""
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Preferencias"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmas"
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "Propiedades da Alarma"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr ""
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "As alarmas sonoras expiran tras"
-
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " segundos"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr ""
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "LMMXVSD"
 
-#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "DLMMXVS"
 
-#: camel/camel-movemail.c:96
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
 #, c-format
-msgid "Could not check mail file %s: %s"
+msgid "Could not create lock file for %s: %s"
+msgstr "Non foi posible crear o ficheiro de bloqueo para %s: %s"
+
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#: camel/camel-lock.c:199
 #, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Non foi posible crear o ficheiro de bloqueo para %s: %s"
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
 
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo %s: %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Non foi posible abrir o ficheiro de correo temporal %s: %s"
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Erro lendo o ficheiro de correo: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Erro escribindo o ficheiro temporal de correo: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Erro С almacenar o correo no ficheiro temporal %s: %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Non foi posible crear unha canalizaciСn: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Non foi posible facer fork: %s"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "O programa movemail fallou: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Erro descoЯecido)"
 
@@ -3013,6 +2684,10 @@ msgstr "Non foi posible conectarse a %s (porto %d): %s"
 msgid "(unknown host)"
 msgstr "(mАquina descoЯecida)"
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -3028,22 +2703,22 @@ msgstr "O URL '%s' necesita unha parte co nome de mАquina"
 msgid "URL '%s' needs a path component"
 msgstr "O URL '%s' necesita unha parte co camiЯo"
 
-#: camel/camel-service.c:486
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:489
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, 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:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -3067,6 +2742,18 @@ 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
+#, 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
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Resposta non agardada do servidor IMAP: %s"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -3077,16 +2764,20 @@ msgstr "Resposta non agardada do servidor IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Erro descoЯecido"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -3096,7 +2787,7 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -3150,48 +2841,195 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
-#, c-format
-msgid "Cannot append message to mbox file: %s"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot get message: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "`%s' non И un ficheiro regular."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Non И posible facer un fork a %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Non foi posible renomear a carpeta `%s': %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Non foi posible borrar a carpeta `%s': %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Non foi posible borrar a carpeta `%s': %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Non И posible obter a mensaxe: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Non foi posible abrir o ficheiro `%s':\n"
+"Non И posible abrir a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "A carpeta `%s' non existe."
 
-#: camel/providers/mbox/camel-mbox-store.c:134
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Non foi posible crear a carpeta `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' non И un directorio."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Non foi posible borrar a carpeta `%s': %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "`%s' non И un directorio."
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Non И posible obter a mensaxe: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Non foi posible abrir o ficheiro `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3200,14 +3038,14 @@ msgstr ""
 "Non foi posible crear o ficheiro `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non И un ficheiro regular."
 
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3216,151 +3054,90 @@ msgstr ""
 "Non foi posible borrar a carpeta `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "A carpeta `%s' non estА baleira. Non borrada."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Non foi posible renomear a carpeta %s a %s: o destino xa existe"
-
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
+"Non И posible abrir a carpeta `%s':\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Local mail file %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
-#, c-format
-msgid "Could not open summary %s"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, 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
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
+"Non И posible abrir a carpeta `%s':\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:688
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Non И posible abrir a caixa de correo temporal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
-msgstr ""
-
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
+#: 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
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:776
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Erro escribindo А caixa de correo temporal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Non И posible copiar os datos С ficheiro de saМda: %s"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Erro escribindo А caixa de correo temporal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:832
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Non foi posible pechar a carpeta orixe %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:841
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Non foi posible pechar a carpeta temporal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:849
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Non foi posible renomear a carpeta: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:861
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Erro descoЯecido: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Non И posible engadir a mensaxe А carpeta mh: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Non И posible obter a mensaxe: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Non И posible abrir a carpeta `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:127
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Non foi posible crear a carpeta `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:136
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' non И un directorio."
 
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Non foi posible borrar a carpeta `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Non foi posible renomear a carpeta `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Non foi posible renomear a carpeta `%s': %s existe"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr ""
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr ""
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3378,7 +3155,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr "O servidor rexeitou o nome de usuario/contrasinal"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Mensaxe %s non atopada."
@@ -3429,16 +3206,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:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Non foi posible recibir a mensaxe do servidor POP %s: %s"
@@ -3526,7 +3303,7 @@ msgstr ""
 "Non foi posible conectarse С servidor POP.\n"
 "Erro enviando o contrasinal: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Non existe a carpeta `%s'."
@@ -3594,111 +3371,107 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:86
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:88
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "IncluМr un ficheiro"
 
-#: composer/e-msg-composer-attachment-bar.c:443 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 filter/filter.glade.h:32
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/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:444
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Quitar os elementos seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Engadir anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "IncluМr un ficheiro como anexo na mensaxe"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:11
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Propiedades do anexo"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-#: composer/e-msg-composer-attachment.glade.h:14
-msgid "MIME type:"
-msgstr "Tipo MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
-#: composer/e-msg-composer-attachment.glade.h:13
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nome de ficheiro:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
-#: mail/mail-format.c:589
+#: po/tmp/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
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Prema aquМ para o libro de enderezos"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 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:300 mail/mail-format.c:602
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Introduza os destinatarios da mensaxe"
 
-#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:609
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 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:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3706,15 +3479,15 @@ msgstr ""
 "Introduza os enderezos que recibirАn unha copia da mensaxe sen apareceren na "
 "lista de destinatarios."
 
-#: composer/e-msg-composer-hdrs.c:318 mail/mail-format.c:614
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Introduza o asunto da mensaxe"
 
-#: composer/e-msg-composer.c:302
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3723,38 +3496,38 @@ msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:458
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: composer/e-msg-composer.c:469
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Erro gardando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:489
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Erro cargando o ficheiro: %s"
 
-#: composer/e-msg-composer.c:511
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Gardando as modificaciСns da mensaxe..."
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Gardar as modificaciСns da mensaxe..."
 
-#: composer/e-msg-composer.c:554
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:598 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:604
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3764,27 +3537,27 @@ msgstr ""
 "\n"
 "©Desexa gardar os cambios?"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "O ficheiro non existe."
 
-#: composer/e-msg-composer.c:762
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Non И un ficheiro normal."
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "O ficheiro existe pero non se pode ler."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:923
 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:804
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3792,15 +3565,15 @@ msgstr ""
 "O ficheiro И moi longo (mАis de 100K).\n"
 "©EstА seguro de querer inserilo?"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Ocorreu un erro lendo o ficheiro."
 
-#: composer/e-msg-composer.c:1209
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "CompoЯer unha mensaxe"
 
-#: composer/e-msg-composer.c:1283
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr ""
 
@@ -3808,6 +3581,11 @@ msgstr ""
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Buscar"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "anos"
@@ -3886,8 +3664,8 @@ msgstr ""
 msgid "<click here to select a date>"
 msgstr "<prema aquМ para seleccionar unha data>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:338
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
@@ -3895,12 +3673,19 @@ msgstr "Engadir Regra de Filtrado"
 msgid "Edit Filter Rule"
 msgstr "Editar Regra de Filtrado"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:456 filter/filter.glade.h:7 filter/filter.glade.h:29
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr ""
+"Entrante\n"
+"SaМnte\n"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Editar Filtros"
 
@@ -3923,19 +3708,19 @@ msgid ""
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Seleccionar Carpeta"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Introduza o URI da carpeta"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<prema aquМ para seleccionar unha carpeta>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3944,7 +3729,12 @@ msgstr ""
 "Erro na expresiСn regular '%s':\n"
 "%s"
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr ""
 
@@ -3956,239 +3746,230 @@ msgstr "Nome da regra: "
 msgid "Untitled"
 msgstr "Sen_tМtulo"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Executar acciСns"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "se se cumpren tСdolos criterios"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "se se cumpre algЗn criterio"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Engadir criterio"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Eliminar criterio"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
+msgid "Edit"
+msgstr "Editar"
+
+#: po/tmp/filter.glade.h:10
+msgid "Edit VFolders"
 msgstr ""
-"Entrante\n"
-"SaМnte\n"
 
-#: filter/filter.glade.h:11 filter/filter.glade.h:31
+#: po/tmp/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "Reglas de Filtrado"
 
-#: filter/filter.glade.h:13 filter/filter.glade.h:18 filter/filter.glade.h:28
-#: mail/mail-config-druid.glade.h:38 mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:17 mail/mail-config.glade.h:23
-#: mail/mail-config.glade.h:32
-msgid "Edit"
-msgstr "Editar"
+#: po/tmp/filter.glade.h:12
+#, fuzzy
+msgid "Incoming"
+msgstr ""
+"Entrante\n"
+"SaМnte\n"
 
-#: filter/filter.glade.h:15 filter/filter.glade.h:30
-msgid "Edit VFolders"
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
 msgstr ""
+"Entrante\n"
+"SaМnte\n"
 
-#: filter/filter.glade.h:16 filter/filter.glade.h:33
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Carpetas Virtuais"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23 filter/filter.glade.h:34
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr ""
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:511
-msgid "Answered"
-msgstr ""
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Asignar Cor"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Asignar PuntuaciСn"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Copiar А Carpeta"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Data de recepciСn"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Data de envМo"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr ""
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "ExpresiСn"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "Reenviar С Enderezo"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Corpo da Mensaxe"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Corpo da Mensaxe"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr ""
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Mover para a Carpeta"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Destinatarios"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:508
-msgid "Seen"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Autor"
 
-#: filter/libfilter-i18n.h:22
-msgid "Set Flag"
-msgstr ""
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "_Estado:"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr ""
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "_Estado:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Asunto"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "contИn"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "non contИn"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "non termina en"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "non existe"
 
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "non empeza por"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "termina en"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "existe"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "И maior que"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "И menor que"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "non И"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "И"
 
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr ""
-
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr ""
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "foi posterior a"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "foi anterior a"
 
@@ -4212,139 +3993,140 @@ msgstr ""
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Non se pode inicializar o compoЯente de correo de Evolution."
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr ""
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr ""
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:143
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
+msgstr "Gardar"
+
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "O corpo ou o asunto conteЯen"
 
-#: mail/folder-browser.c:144
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "O corpo contИn"
 
-#: mail/folder-browser.c:145
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "O asunto contИn"
 
-#: mail/folder-browser.c:146
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "O corpo non contИn"
 
-#: mail/folder-browser.c:147
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "O asunto non contИn"
 
-#: mail/folder-browser.c:148
-msgid "Custom search"
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
 msgstr ""
 
-#: mail/folder-browser.c:320
-msgid "Custom"
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:478
-msgid "Open in New Window"
-msgstr "Abrir nunha Nova Fiestra"
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr ""
 
-#: mail/folder-browser.c:479
-msgid "Edit Message"
-msgstr "Editar Mensaxe"
+#: mail/folder-browser.c:458
+msgid "Filter on Sender"
+msgstr ""
 
-#: mail/folder-browser.c:480 mail/mail-callbacks.c:794
-msgid "Print Message"
-msgstr "Imprimir Mensaxe"
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr ""
 
-#: mail/folder-browser.c:482
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "_Abrir"
+
+#: mail/folder-browser.c:466
+#, 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
+msgid "Print"
+msgstr "Imprimir"
+
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Responder С Autor"
 
-#: mail/folder-browser.c:483 mail/mail-view.c:156 ui/evolution-mail.xml.h:33
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Responder a Todos"
 
-#: mail/folder-browser.c:484
-msgid "Forward Message"
-msgstr "Reenviar esta mensaxe"
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr "Re-enviar"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Ir para diante no tempo"
 
-#: mail/folder-browser.c:486
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr ""
 
-#: mail/folder-browser.c:487
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr ""
 
-#: mail/folder-browser.c:488
-msgid "Delete Message"
-msgstr "Borrar Mensaxe"
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Mover para a Carpeta"
 
-#: mail/folder-browser.c:489
-msgid "Move Message"
-msgstr "Mover Mensaxe"
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Copiar А Carpeta"
 
-#: mail/folder-browser.c:490
-msgid "Copy Message"
-msgstr "Copiar Mensaxe"
+#: mail/folder-browser.c:480
+#, fuzzy
+msgid "Undelete"
+msgstr "Eliminar"
 
-#: mail/folder-browser.c:491
+#. { _("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
 msgid "Apply Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/folder-browser.c:493
-msgid "VFolder on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:494
-msgid "VFolder on Sender"
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
 msgstr ""
 
-#: mail/folder-browser.c:495
-msgid "VFolder on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:497
-msgid "Filter on Subject"
-msgstr ""
-
-#: mail/folder-browser.c:498
-msgid "Filter on Sender"
-msgstr ""
-
-#: mail/folder-browser.c:499
-msgid "Filter on Recipients"
-msgstr ""
-
-#: mail/folder-browser.c:500 mail/folder-browser.c:523
-msgid "Filter on Mailing List"
-msgstr ""
-
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser.c:641
-msgid "Full Search"
-msgstr ""
-
-#: mail/folder-browser.c:646 ui/evolution-event-editor.xml.h:91
-msgid "Save"
-msgstr "Gardar"
-
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4355,12 +4137,12 @@ msgstr "Enviar por correo a %s"
 msgid "Subject is %s"
 msgstr "O asunto И %s"
 
-#: mail/mail-autofilter.c:232
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Enviar dende %s"
 
-#: mail/mail-autofilter.c:334
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
@@ -4411,15 +4193,15 @@ msgstr ""
 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:533
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Mover mensaxe(s) a"
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Copiar mensaxe(s) a"
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4427,7 +4209,29 @@ msgstr ""
 "SС pode editar mensaxes gardados\n"
 "na carpeta de Borrador."
 
-#: mail/mail-callbacks.c:749
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "©Sobrescribir ficheiro?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Xa existe un ficheiro con ese nome.\n"
+"©Sobrescribilo?"
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Gardar como..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Gardar como..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4436,71 +4240,111 @@ msgstr ""
 "Erro cargando a informaciСn do filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:841
+#: mail/mail-callbacks.c:922
+msgid "Print Message"
+msgstr "Imprimir Mensaxe"
+
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "A impresiСn da mensaxe fallou"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr "Identidade"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "ConfiguraciСn do Correo"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "Fonte de Correo"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transporte do Correo"
+
+#: po/tmp/mail-config-druid.glade.h:10
+#, fuzzy
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr "║Benvido С axudante da ConfiguraciСn de Correo do Evolution!"
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"A configuraciСn do correo electrСnico estА completa.\n"
+"Prema \"Finalizar\" para gardar a nova configuraciСn"
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Enderezo de email:"
 
-#: mail/mail-config-druid.glade.h:53 mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "OrganizaciСn:"
 
-#: mail/mail-config-druid.glade.h:75 mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Ficheiro de sinatura:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
-#: mail/mail-config.glade.h:42
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Ficheiro de Sinatura"
 
-#: mail/mail-config-druid.glade.h:74 mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config-druid.glade.h:79 mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: mail/mail-config-druid.glade.h:55 mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "CamiЯo:"
 
-#: mail/mail-config-druid.glade.h:26 mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "AutenticaciСn:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Detectar tipos soportados..."
 
-#: mail/mail-config-druid.glade.h:36 mail/mail-config-gui.c:967
+#: 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"
 
-#: mail/mail-config-druid.glade.h:77 mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Probar ConfiguraciСn"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Tipo de fonte de correo:"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4509,11 +4353,11 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "Tipo de fonte de Novas:"
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4522,353 +4366,112 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "Tipo de transporte de correo:"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Engadir Identidade"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "Editar Identidade"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Engadir Fonte"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Editar Fonte"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Engadir Servidor de News"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Editar Servidor de News"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Probando \"%s\""
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "║A conexiСn foi correcta!"
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 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.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16 mail/mail-config-druid.glade.h:46
-msgid "Mail Configuration"
-msgstr "ConfiguraciСn do Correo"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13 mail/mail-config-druid.glade.h:44
-msgid "Identity"
-msgstr "Identidade"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Fonte de Correo"
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-#: mail/mail-config.glade.h:35
-msgid "Mail Transport"
-msgstr "Transporte do Correo"
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-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:19
-msgid "Account Information"
-msgstr "InformaciСn de Contas"
-
-#: mail/mail-config-druid.glade.h:20
-msgid "Account Management"
-msgstr "XestiСn e Contas"
-
-#: mail/mail-config-druid.glade.h:21
-msgid "Accounts"
-msgstr "Contas"
-
-#: mail/mail-config-druid.glade.h:23
-msgid "Add Optional Fields..."
-msgstr "Engadir Campos Opcionais..."
-
-#: mail/mail-config-druid.glade.h:24
-msgid "Additional Identity Fields"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:25
-msgid "Authentication"
-msgstr "AutenticaciСn"
-
-#: mail/mail-config-druid.glade.h:27
-msgid "Browse..."
-msgstr "Explorar..."
-
-#: mail/mail-config-druid.glade.h:28
-msgid "Congratulations, your mail configuration is complete."
-msgstr "Noraboa, a configuraciСn do correo estА completa."
-
-#: mail/mail-config-druid.glade.h:34
-msgid "Default"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:37
-msgid "Done"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:39
-msgid "Edit Mail Configuration Settings"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:40
-msgid "Email Address:"
-msgstr "Enderezo de Email:"
-
-#: mail/mail-config-druid.glade.h:41
-msgid "Evolution Mail Configuration"
-msgstr "ConfiguraciСn de Correo do Evolution"
-
-#: mail/mail-config-druid.glade.h:42
-msgid "Full Name:"
-msgstr "Nome Completo:"
-
-#: mail/mail-config-druid.glade.h:43
-msgid "IMAP"
-msgstr "IMAP"
-
-#: mail/mail-config-druid.glade.h:45
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/mail-config-druid.glade.h:47
-msgid "Mail Configuration Druid"
-msgstr "Axudante da ConfiguraciСn do Correo"
-
-#: mail/mail-config-druid.glade.h:48
-msgid "Make this my default account"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:50
-msgid "News"
-msgstr "Novas"
-
-#: mail/mail-config-druid.glade.h:51
-msgid "Optional"
-msgstr "Opcional"
-
-#: mail/mail-config-druid.glade.h:52
-msgid "Optional Information"
-msgstr "InformaciСn Opcional"
-
-#: mail/mail-config-druid.glade.h:54
-msgid "Password:"
-msgstr "Contrasinal:"
-
-#: mail/mail-config-druid.glade.h:56
-msgid ""
-"Please enter information about your incoming mail server below. If you don't "
-"know what"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:58
-msgid ""
-"Please enter information about your outgoing mail protocol below. If you "
-"don't know "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:60
-msgid ""
-"Please enter your name and email address below. The &quot;optional&quot; "
-"fields below do not "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:62
-msgid "Preferred type: "
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:63
-msgid "Receiving Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:64
-msgid "Receiving Mail"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:65
-msgid "Remember my password"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:66
-msgid "Reply-to:"
-msgstr "Responder-a:"
-
-#: mail/mail-config-druid.glade.h:67
-msgid "Required"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:68
-msgid "SMTP"
-msgstr "SMTP"
-
-#: mail/mail-config-druid.glade.h:69
-msgid "SMTP server requires authentication"
-msgstr "O servidor SMTP require autenticaciСn"
-
-#: mail/mail-config-druid.glade.h:70
-msgid "Sending Email"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:71
-msgid "Sending Mail"
-msgstr "Enviando Correo"
-
-#: mail/mail-config-druid.glade.h:72
-msgid "Server Configuration"
-msgstr "ConfiguraciСn do Servidor"
-
-#: mail/mail-config-druid.glade.h:73
-msgid "Server Type: "
-msgstr "Tipo de Servidor: "
-
-#: mail/mail-config-druid.glade.h:76 mail/mail-config.glade.h:15
-#: mail/mail-config.glade.h:43
-msgid "Sources"
-msgstr "Fontes"
-
-#: mail/mail-config-druid.glade.h:80
-msgid "Welcome to the Evolution Mail Configuration Druid! "
-msgstr "║Benvido С axudante da ConfiguraciСn de Correo do Evolution!"
-
-#: mail/mail-config-druid.glade.h:86
-msgid ""
-"You are almost done with the mail configuration process. The identity, "
-"incoming"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:90
-msgid "Your mail server supports the following types of authentication. Please"
-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.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-#: mail/mail-config.glade.h:33
-msgid "Identities"
-msgstr "Identidades"
-
-#: mail/mail-config.glade.h:8 mail/mail-config.glade.h:30
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Enderezo"
 
-#: mail/mail-config.glade.h:9 mail/mail-config.glade.h:39
-msgid "Organization"
-msgstr "OrganizaciСn"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr "Identidades"
 
-#: mail/mail-config.glade.h:19 mail/mail-config.glade.h:34
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Fontes de Correo"
 
-#: mail/mail-config.glade.h:21 mail/mail-config.glade.h:37
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
+msgstr "Marcar mensaxe como lida [ms]: "
+
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Servidores de News"
 
-#: mail/mail-config.glade.h:25 mail/mail-config.glade.h:38
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Fontes de Novas"
 
-#: mail/mail-config.glade.h:26 mail/mail-config.glade.h:41
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "OrganizaciСn"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Enviar mensaxes en formato HTML"
 
-#: mail/mail-config.glade.h:27 mail/mail-config.glade.h:36
-msgid "Mark message as seen [ms]: "
-msgstr "Marcar mensaxe como lida [ms]: "
-
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Non foi posible crear unha canalizaciСn con %s: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Non foi posible executar %s: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Non И posible facer un fork a %s: %s"
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Fontes"
 
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Introduza o seu contrasinal de PGP/GPG."
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Non se indicou un contrasinal."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, 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:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "O programa GPG/PGP non estА dispoЯible."
 
-#: mail/mail-display.c:66
-msgid "Overwrite file?"
-msgstr "©Sobrescribir ficheiro?"
-
-#: mail/mail-display.c:70
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Xa existe un ficheiro con ese nome.\n"
-"©Sobrescribilo?"
-
-#: mail/mail-display.c:84
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4877,407 +4480,437 @@ msgstr ""
 "Non foi posible abrir o ficheiro %s:\n"
 "%s"
 
-#: mail/mail-display.c:96
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Gardar Anexo"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Gardar С Disco..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Visualizador Externo"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Agochar"
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr ""
 
-#: mail/mail-format.c:595
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
-#: mail/mail-format.c:835
+#: mail/mail-format.c:845
 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:847
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "Mensaxe cifrada non visualizada"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "Mensaxe cifrada"
 
-#: mail/mail-format.c:854
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1468
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1472
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1506
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1511
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando a carpeta \"%s\" С formato \"%s\""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar carpeta \"%s\" С formato \"%s\""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Pechando a carpeta actual"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Renomeando a carpeta antiga e abrindo"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Creando unha nova carpeta"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Copiando as mensaxes"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:341
 #, 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:443
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX sen ler)"
+#: mail/mail-local.c:781
+#, fuzzy
+msgid "Registering local folder"
+msgstr "Creando unha nova carpeta"
+
+#: mail/mail-local.c:783
+#, fuzzy
+msgid "Register local folder"
+msgstr "Crear unha nova carpeta"
 
-#: mail/mail-ops.c:69
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Recibindo correo de %s"
 
-#: mail/mail-ops.c:71
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Recibir correo de %s"
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Non hai novo correo en %s."
 
-#: mail/mail-ops.c:366
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:368
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:500
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Enviando \"%s\""
 
-#: mail/mail-ops.c:505
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "Enviando unha mensaxe sen asunto"
 
-#: mail/mail-ops.c:508
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:511
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Enviar unha mensaxe sen asunto"
 
-#: mail/mail-ops.c:682
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:684
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:820 mail/mail-ops.c:827
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:824 mail/mail-ops.c:830
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:963
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Movendo mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copiando mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:970
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copiar mensaxes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Movendo"
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:1024
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaxe %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1103
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Marcando mensaxes na carpeta \"%s\""
 
-#: mail/mail-ops.c:1106
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Marcar mensaxes na carpeta \"%s\""
 
-#: mail/mail-ops.c:1137
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Marcando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando as carpetas en \"%s\""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1331 mail/subscribe-dialog.c:324
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Sen descriciСn)"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Reenviando mensaxes \"%s\""
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Reenviando unha mensaxe sen asunto"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Reenviar mensaxe \"%s\""
 
-#: mail/mail-ops.c:1511
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1548
+#: 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:1565
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1665
+#, 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:1653
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Creando \"%s\""
 
-#: mail/mail-ops.c:1757
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1805
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Sincronizando \"%s\""
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Amosar a mensaxe co UID \"%s\""
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Cargando a Carpeta %s"
 
-#: mail/mail-ops.c:2148
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Vendo as mensaxes da carpeta \"%s\""
 
-#: mail/mail-ops.c:2218
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2244
+#: 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-search-dialogue.c:101
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Recibindo a mensaxe %d de %d (uid \"%s\")"
+
+#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: mail/mail-summary.c:97 mail/mail-threads.c:703
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-summary.c:370
-msgid "Mailbox summary"
-msgstr ""
-
 #: mail/mail-threads.c:301
 #, c-format
 msgid ""
@@ -5285,87 +4918,82 @@ msgid ""
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Non foi posible crear a caixa de diАlogo."
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "O usuario cancelou a consulta."
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 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:264
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "Examinando %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Recibindo a mensaxe %d de %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Escribindo a mensaxe %d de %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Gardando as modificaciСns de %s"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaxe reenviada)"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sen asunto)"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaxe reenviada - %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "Mensaxe reenviada (sen asunto)"
 
-#: mail/mail-tools.c:510
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "O protocolo para abrir o URI `%s' И descoЯecido"
-
-#: mail/mail-tools.c:539
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5378,63 +5006,70 @@ msgstr ""
 msgid "VFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 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 ui/evolution-mail.xml.h:32
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:153 ui/evolution-mail.xml.h:37
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Responder С autor desta mensaxe"
 
-#: mail/mail-view.c:156 ui/evolution-mail.xml.h:36
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Responder a tСdolos destinatarios desta mensaxe"
 
-#: mail/mail-view.c:159 ui/evolution-mail.xml.h:17
-msgid "Forward"
-msgstr "Re-enviar"
-
-#: mail/mail-view.c:159 ui/evolution-mail.xml.h:18
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Re-enviar esta mensaxe"
 
-#: mail/mail-view.c:163 ui/evolution-addressbook.xml.h:14
-#: ui/evolution-calendar.xml.h:24 ui/evolution-mail.xml.h:27
-msgid "Print"
-msgstr "Imprimir"
-
-#: mail/mail-view.c:163 ui/evolution-mail.xml.h:31
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Imprimir a mensaxe seleccionada"
 
-#: mail/mail-view.c:165 ui/evolution-mail.xml.h:12
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Borrar esta mensaxe"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:2043
-msgid "Rebuilding message view"
+#: mail/message-list.c:575
+msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:2045
-msgid "Rebuild message view"
+#: mail/message-list.c:578
+msgid "Answered"
 msgstr ""
 
-#: mail/message-thread.c:582
-msgid "Threading message list"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
 msgstr ""
 
-#: mail/message-thread.c:584
-msgid "Thread message list"
+#. 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
+
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "DescoЯecido"
+
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
+msgstr ""
+
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
 msgstr ""
 
 #: mail/subscribe-dialog.c:139
@@ -5451,31 +5086,31 @@ msgstr ""
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:282
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
-#, c-format
-msgid "Subscribe to folder \"%s\""
-msgstr ""
+#: mail/subscribe-dialog.c:286
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:387
+#: mail/subscribe-dialog.c:290
 #, c-format
-msgid "Unsubscribing to folder \"%s\""
+msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:390
-#, c-format
-msgid "Unsubscribe to folder \"%s\""
-msgstr ""
+#: mail/subscribe-dialog.c:293
+#, fuzzy, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr "Abrindo as mensaxes da carpeta \"%s\""
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "InstalaciСn de Evolution"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5483,29 +5118,29 @@ msgstr ""
 "Esta nova versiСn do Evolution necesita instalar ficheiros\n"
 "adicionais no seu directorio persoal do Evolution"
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 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:152
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Ficheiros de Evolution instalados con Иxito."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "Semella que И a primeira vez que executa Evolution."
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:188
 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:197
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5516,7 +5151,7 @@ msgstr ""
 "%s\n"
 "Erro: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5525,7 +5160,7 @@ msgstr ""
 "Non se poden copiar os ficheiros a\n"
 "`%s'."
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5536,7 +5171,7 @@ msgstr ""
 "MСvao para poder instalar os ficheiros de\n"
 "usuario de Evolution."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5592,11 +5227,11 @@ msgstr "Bug buddy non foi atopado no seu $PATH."
 msgid "Bug buddy could not be run."
 msgstr "Non se puido executar Bug buddy."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5606,37 +5241,37 @@ msgstr ""
 "en grupo para xestiСn de correo, axenda e contactos\n"
 "dentro do ambiente de escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Ir А carpeta..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Ningunha carpeta visualizada)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:1021
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1167
+#: shell/e-shell.c:372
 #, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Non se pode activar o almacenamento local -- %s"
+
+#: shell/e-shell.c:1208
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Ooops!  A vista de `%s' morreu inesperadamente.  :-(\n"
 "Isto significa probablemente que o compoЯente %s se estragou."
 
-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Non se pode activar o almacenamento local -- %s"
-
 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
 msgstr "Crear novo grupo de atallos"
@@ -5706,64 +5341,65 @@ msgstr "Eliminar este atallo da barra de atallos"
 msgid "Error saving shortcuts."
 msgstr "Erro gardando atallos."
 
-#: shell/e-storage.c:128
+#: 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
+msgid "_View"
+msgstr "_Vista"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Ver carpeta seleccionada"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Sen nome)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Sen erro"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Erro xenИrico"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Xa existe unha carpeta co mesmo nome"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "O tipo da carpeta especificada non И vАlido"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "Erro de E/S"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Non hai espacio dabondo para crear a carpeta"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Non se atopou a carpeta especificada"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "FunciСn non implementada neste almacenamento"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "OperaciСn non soportada"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "O tipo especificado non estА soportado neste almacenamento"
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.xml.h:126
-#: ui/evolution.xml.h:37
-msgid "_View"
-msgstr "_Vista"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Ver carpeta seleccionada"
-
-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5785,7 +5421,7 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5793,986 +5429,1151 @@ msgstr ""
 "GraciЯas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Non se pode inicializar a shell de Evolution."
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr "Desactivar."
 
-#: shell/main.c:166
+#: shell/main.c:198
 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.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.xml.h:7
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "Novo Servidor de _Directorio"
 
-#: ui/evolution-addressbook-ldap.xml.h:8
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "_AcciСns"
 
-#: ui/evolution-addressbook.xml.h:8
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Crear un novo contacto"
 
-#: ui/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Borrar un contacto"
 
-#: ui/evolution-addressbook.xml.h:11 ui/evolution-event-editor.xml.h:70
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Buscar"
 
-#: ui/evolution-addressbook.xml.h:12
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Buscar un contacto"
 
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-calendar.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Novo"
 
-#: ui/evolution-addressbook.xml.h:15
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Imprimir contactos"
 
-#: ui/evolution-addressbook.xml.h:16
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Parar"
 
-#: ui/evolution-addressbook.xml.h:17
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Parar a Carga"
 
-#: ui/evolution-addressbook.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Ver Todos"
 
-#: ui/evolution-addressbook.xml.h:19
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Ver tСdolos contactos"
 
-#: ui/evolution-addressbook.xml.h:20
-msgid "_New Contact"
-msgstr "_Novo Contacto"
-
-#: ui/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "_Imprimir Contactos..."
 
-#: ui/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_Buscar contactos"
 
-#: ui/evolution-addressbook.xml.h:23 ui/evolution-event-editor.xml.h:124
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Ferramentas"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:7
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 DМas"
 
-#: ui/evolution-calendar.xml.h:8
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Axenda"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Preferencias da Axenda..."
 
-#: ui/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: ui/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
-#: ui/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "DМa"
 
-#: ui/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Ir para atrАs no tempo"
 
-#: ui/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Ir para diante no tempo"
 
-#: ui/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Ir para"
 
-#: ui/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Ir para a data especificada"
 
-#: ui/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:18
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mes"
 
-#: ui/evolution-calendar.xml.h:20
-msgid "New Ca_lendar"
-msgstr "Nova A_xenda"
-
-#: ui/evolution-calendar.xml.h:21 ui/evolution-event-editor.xml.h:77
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Seguinte"
 
-#: ui/evolution-calendar.xml.h:22
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Abrir unha axenda"
 
-#: ui/evolution-calendar.xml.h:23
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:25
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Imprimir esta axenda"
 
-#: ui/evolution-calendar.xml.h:26
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:27
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Amosar un dМa"
 
-#: ui/evolution-calendar.xml.h:28
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Amosar un mes"
 
-#: ui/evolution-calendar.xml.h:29
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Amosar unha semana"
 
-#: ui/evolution-calendar.xml.h:30
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Amosar a semana laboral"
 
-#: ui/evolution-calendar.xml.h:31 widgets/misc/e-dateedit.c:365
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Hoxe"
 
-#: ui/evolution-calendar.xml.h:32
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Semana"
 
-#: ui/evolution-calendar.xml.h:33 ui/evolution.xml.h:33
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Novo"
 
-#: ui/evolution-calendar.xml.h:34
-msgid "_New appointment..."
-msgstr "_Nova cita..."
-
-#: ui/evolution-calendar.xml.h:35
-msgid "_Open"
-msgstr "_Abrir"
-
-#: ui/evolution-calendar.xml.h:36
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Abrir axenda"
 
-#: ui/evolution-calendar.xml.h:37
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Imprimir esta axenda"
 
-#: ui/evolution-calendar.xml.h:38
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "_Gardar Axenda Como"
 
-#: ui/evolution-contact-editor.xml.h:9
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Borrar este elemento"
 
-#: ui/evolution-contact-editor.xml.h:10
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "Eliminar"
+
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Axuda"
 
-#: ui/evolution-contact-editor.xml.h:11 ui/evolution-event-editor.xml.h:84
+#: po/tmp/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
 msgid "Print this item"
 msgstr "Imprimir este elemento"
 
-#: ui/evolution-contact-editor.xml.h:12 ui/evolution-event-editor.xml.h:85
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Imprimir..."
 
-#: ui/evolution-contact-editor.xml.h:13
-msgid "Save _As"
-msgstr "Gardar _Como"
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Gardar _Como..."
 
-#: ui/evolution-contact-editor.xml.h:14 ui/evolution-event-editor.xml.h:93
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Gardar e Pechar"
 
-#: ui/evolution-contact-editor.xml.h:15
+#: po/tmp/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"
 
-#: ui/evolution-contact-editor.xml.h:16 ui/evolution-event-editor.xml.h:99
+#: po/tmp/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
 msgid "See online help"
 msgstr "Ver a axuda online"
 
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-event-editor.xml.h:111
-#: ui/evolution-subscribe.xml.h:17 ui/evolution.xml.h:27
+#: po/tmp/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
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: ui/evolution-contact-editor.xml.h:18 ui/evolution-event-editor.xml.h:118
-msgid "_Print"
-msgstr "_Imprimir"
+#: po/tmp/evolution-contact-editor.xml.h:20
+#, fuzzy
+msgid "_Print..."
+msgstr "Imprimir..."
 
-#: ui/evolution-contact-editor.xml.h:19 ui/evolution-event-editor.xml.h:122
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Gardar"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:7
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "Acerca desta aplicaciСn"
 
-#: ui/evolution-event-editor.xml.h:8
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Acerca de..."
 
-#: ui/evolution-event-editor.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "AcciС_ns"
 
-#: ui/evolution-event-editor.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "_Limpar"
 
-#: ui/evolution-event-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "Co_rtar"
 
-#: ui/evolution-event-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Limpar"
 
-#: ui/evolution-event-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Limpar a selecciСn"
 
-#: ui/evolution-event-editor.xml.h:15
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Pechar esta cita"
 
-#: ui/evolution-event-editor.xml.h:16 ui/evolution-mail.xml.h:9
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Copiar"
 
-#: ui/evolution-event-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Copiar a selecciСn"
 
-#: ui/evolution-event-editor.xml.h:18
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Cortar"
 
-#: ui/evolution-event-editor.xml.h:19
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Cortar a selecciСn"
 
-#: ui/evolution-event-editor.xml.h:22
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Envorcar XML"
 
-#: ui/evolution-event-editor.xml.h:23
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Envorcar a descriciСn Xml da Interface"
 
-#: ui/evolution-event-editor.xml.h:24
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr "FIXME: _Libro de enderezos..."
 
-#: ui/evolution-event-editor.xml.h:25
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: Es_colla un Formulario..."
 
-#: ui/evolution-event-editor.xml.h:26
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr "FIXME: Veri_ficar Nomes"
 
-#: ui/evolution-event-editor.xml.h:27
+#: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr "FIXME: Cop_iar А Carpeta..."
 
-#: ui/evolution-event-editor.xml.h:28
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr "FIXME: _DeseЯar un Formulario..."
 
-#: ui/evolution-event-editor.xml.h:29
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: Definir E_stilos de ImpresiСn"
 
-#: ui/evolution-event-editor.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr "FIXME: DeseЯar este _Formulario"
 
-#: ui/evolution-event-editor.xml.h:31
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr "FIXME: Pri_meiro elemento na Carpeta"
 
-#: ui/evolution-event-editor.xml.h:32
+#: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr "FIXME: _Reenviar"
 
-#: ui/evolution-event-editor.xml.h:33
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr "FIXME: Reenviar como v_Calendar"
 
-#: ui/evolution-event-editor.xml.h:34
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr "FIXME: Axuda"
 
-#: ui/evolution-event-editor.xml.h:35
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr "FIXME: Tarefa in_completa"
 
-#: ui/evolution-event-editor.xml.h:36
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr "FIXME: Inserir Ficheiro"
 
-#: ui/evolution-event-editor.xml.h:37
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr "FIXME: _Elemento..."
 
-#: ui/evolution-event-editor.xml.h:38
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr "FIXME: Pegar _Especial..."
 
-#: ui/evolution-event-editor.xml.h:39
+#: po/tmp/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr "FIXME: Pre_visualizaciСn da ImpresiСn"
 
-#: ui/evolution-event-editor.xml.h:40
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr "FIXME: Pu_blicar Formulario Como..."
 
-#: ui/evolution-event-editor.xml.h:41
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr "FIXME: Publicar _Formulario..."
 
-#: ui/evolution-event-editor.xml.h:42
+#: po/tmp/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:43
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: _Enviar"
 
-#: ui/evolution-event-editor.xml.h:44
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: Gardar Ane_xos..."
 
-#: ui/evolution-event-editor.xml.h:45
-msgid "FIXME: Schedule Meeting"
-msgstr "FIXME: Programar ReuniСn"
-
-#: ui/evolution-event-editor.xml.h:46
-msgid "FIXME: Schedule _Meeting"
-msgstr "FIXME: _Programar ReuniСn"
-
-#: ui/evolution-event-editor.xml.h:47
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr "FIXME: _Depurador de Script"
 
-#: ui/evolution-event-editor.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Solicitude de _Tarefa"
 
-#: ui/evolution-event-editor.xml.h:49
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "FIXME: _Contacto"
 
-#: ui/evolution-event-editor.xml.h:50
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr "FIXME: _Personalizar..."
 
-#: ui/evolution-event-editor.xml.h:51
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "FIXME: _Ficheiro..."
 
-#: ui/evolution-event-editor.xml.h:52
+#: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "FIXME: _Fonte..."
 
-#: ui/evolution-event-editor.xml.h:53
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr "FIXME: Fo_rmato"
 
-#: ui/evolution-event-editor.xml.h:54
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Elemento"
 
-#: ui/evolution-event-editor.xml.h:55
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "FIXME: Entrada de _Xornal"
 
-#: ui/evolution-event-editor.xml.h:56
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _Derradeiro Elemento na Carpeta"
 
-#: ui/evolution-event-editor.xml.h:57
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr "FIXME: Enviar _Mensaxe"
 
-#: ui/evolution-event-editor.xml.h:58
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:59
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: _Mover para a Carpeta..."
 
-#: ui/evolution-event-editor.xml.h:60
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "FIXME: _Nova Cita"
 
-#: ui/evolution-event-editor.xml.h:61
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr "FIXME: _Nota"
 
-#: ui/evolution-event-editor.xml.h:62
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr "FIXME: _Obxecto..."
 
-#: ui/evolution-event-editor.xml.h:63
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "FIXME: _ParАgrafo..."
 
-#: ui/evolution-event-editor.xml.h:64
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "FIXME: _OrtografМa..."
 
-#: ui/evolution-event-editor.xml.h:65
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: _EstАndar"
 
-#: ui/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr "FIXME: _Tarefa"
 
-#: ui/evolution-event-editor.xml.h:67
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr "FIXME: Elemento _non Lido"
 
-#: ui/evolution-event-editor.xml.h:68
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:69
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "_Formatar"
 
-#: ui/evolution-event-editor.xml.h:71
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Buscar Novamente"
 
-#: ui/evolution-event-editor.xml.h:72
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Buscar _Novamente"
 
-#: ui/evolution-event-editor.xml.h:73
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Ir С elemento seguinte"
 
-#: ui/evolution-event-editor.xml.h:74
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Ir С elemento anterior"
 
-#: ui/evolution-event-editor.xml.h:75
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Modificar as propiedades do ficheiro"
 
-#: ui/evolution-event-editor.xml.h:76
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "Se_guinte"
 
-#: ui/evolution-event-editor.xml.h:78
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Pegar"
 
-#: ui/evolution-event-editor.xml.h:79
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do cartafol"
 
-#: ui/evolution-event-editor.xml.h:80
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: ui/evolution-event-editor.xml.h:81
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Anterior"
 
-#: ui/evolution-event-editor.xml.h:82
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "_ConfiguraciСn da ImpresiСn..."
 
-#: ui/evolution-event-editor.xml.h:83
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "ConfiguraciСn da ImpresiСn"
 
-#: ui/evolution-event-editor.xml.h:86
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "Propiedades"
 
-#: ui/evolution-event-editor.xml.h:87
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "Refacer"
 
-#: ui/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Refacer a acciСn desfeita"
 
-#: ui/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "SubstituМr"
 
-#: ui/evolution-event-editor.xml.h:90
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "SubstituМr unha cadea"
 
-#: ui/evolution-event-editor.xml.h:92
-msgid "Save _As..."
-msgstr "Gardar _Como..."
-
-#: ui/evolution-event-editor.xml.h:94
+#: po/tmp/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"
 
-#: ui/evolution-event-editor.xml.h:95
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Gardar o ficheiro actual"
 
-#: ui/evolution-event-editor.xml.h:96
+#: po/tmp/evolution-event-editor.xml.h:93
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "FIXME: Programar ReuniСn"
+
+#: po/tmp/evolution-event-editor.xml.h:94
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "FIXME: _Programar ReuniСn"
+
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:97
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Buscar novamente a mesma cadea"
 
-#: ui/evolution-event-editor.xml.h:98
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Buscar unha cadea"
 
-#: ui/evolution-event-editor.xml.h:100
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:101
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Seleccionar todo"
 
-#: ui/evolution-event-editor.xml.h:102
+#: po/tmp/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"
 
-#: ui/evolution-event-editor.xml.h:103
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Desfacer"
 
-#: ui/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Desfacer a Зltima acciСn"
 
-#: ui/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "_Acerca de..."
 
-#: ui/evolution-event-editor.xml.h:106
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "_Pechar"
 
-#: ui/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: ui/evolution-event-editor.xml.h:108
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr "_DepuraciСn"
 
-#: ui/evolution-event-editor.xml.h:110 ui/evolution-subscribe.xml.h:16
-#: ui/evolution.xml.h:26
+#: 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
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ui/evolution-event-editor.xml.h:112
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Buscar..."
 
-#: ui/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr "_Formularios"
 
-#: ui/evolution-event-editor.xml.h:114 ui/evolution.xml.h:30
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "A_xuda"
 
-#: ui/evolution-event-editor.xml.h:115
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ui/evolution-event-editor.xml.h:116
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Obxecto"
 
-#: ui/evolution-event-editor.xml.h:117
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: ui/evolution-event-editor.xml.h:119
+#: po/tmp/evolution-event-editor.xml.h:117
+msgid "_Print"
+msgstr "_Imprimir"
+
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: ui/evolution-event-editor.xml.h:120
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_Refacer"
 
-#: ui/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_SubstituМr..."
 
-#: ui/evolution-event-editor.xml.h:123
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr "_Barras de ferramentas"
 
-#: ui/evolution-event-editor.xml.h:125
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Desfacer"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:7
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Redactar"
 
-#: ui/evolution-mail.xml.h:8
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Redactar unha nova mensaxe"
 
-#: ui/evolution-mail.xml.h:10
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Copiar a mensaxe nunha nova carpeta"
 
-#: ui/evolution-mail.xml.h:13 ui/evolution-subscribe.xml.h:9
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "_Carpeta"
 
-#: ui/evolution-mail.xml.h:14
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:15
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:16
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Esquecer _Contrasinais"
 
-#: ui/evolution-mail.xml.h:19
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Recibir Correo"
 
-#: ui/evolution-mail.xml.h:20
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "_Filtros de Correo..."
 
-#: ui/evolution-mail.xml.h:21
-msgid "Manage Subscriptions..."
-msgstr ""
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "DescriciСn:"
 
-#: ui/evolution-mail.xml.h:22
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "Marcar como _Lida"
 
-#: ui/evolution-mail.xml.h:23
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Marcar como _non Lida"
 
-#: ui/evolution-mail.xml.h:24
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Mover"
 
-#: ui/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Mover mensaxe a unha nova carpeta"
 
-#: ui/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Previsualiza a mensaxe que se vai imprimir"
 
-#: ui/evolution-mail.xml.h:28
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "PrevisualizaciСn da ImpresiСn da mensaxe..."
 
-#: ui/evolution-mail.xml.h:29
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Imprimir mensaxe na impresora"
 
-#: ui/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Imprimir mensaxe..."
 
-#: ui/evolution-mail.xml.h:34
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: ui/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Responder С _Autor"
 
-#: ui/evolution-mail.xml.h:38 ui/evolution-subscribe.xml.h:13
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Seleccionar _Todo"
 
-#: ui/evolution-mail.xml.h:39
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar o correo na cola e recibir o correo novo"
 
-#: ui/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:41
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:42
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:43
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "_Aplicar Filtros"
 
-#: ui/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "_Configurar Carpeta"
 
-#: ui/evolution-mail.xml.h:45
-msgid "_Copy to Folder"
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
 msgstr "_Copiar А Carpeta"
 
-#: ui/evolution-mail.xml.h:47
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "_Editar Mensaxe"
 
-#: ui/evolution-mail.xml.h:48
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: ui/evolution-mail.xml.h:51 ui/evolution-subscribe.xml.h:18
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Inverter SelecciСn"
 
-#: ui/evolution-mail.xml.h:52
-msgid "_Mail Configuration..."
-msgstr "ConfiguraciСn do _Correo..."
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "ConfiguraciСn do Correo"
 
-#: ui/evolution-mail.xml.h:53
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ui/evolution-mail.xml.h:54
-msgid "_Move to Folder"
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
 msgstr "_Mover para a Carpeta"
 
-#: ui/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "_Abrir nunha Nova Fiestra"
 
-#: ui/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "_Imprimir Mensaxe"
 
-#: ui/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Gardar como..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Fontes"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Borrar"
+
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:59
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
+msgstr "Carpetas Virtuais"
+
+#.
+#. * 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
+#, fuzzy
+msgid "Attach"
+msgstr "IncluМr un ficheiro"
+
+#: po/tmp/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
+msgid "HTML"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:12
+#, 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
+msgid "Insert text file..."
 msgstr ""
 
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "Abrir ficheiro"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "Gardar _Como"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save in _folder... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Ir А carpeta..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save the current file with a different name"
+msgstr "Gardar o ficheiro actual"
+
+#: po/tmp/evolution-message-composer.xml.h:23
+#, fuzzy
+msgid "Save the message in a specified folder"
+msgstr "Mover mensaxe a unha nova carpeta"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send"
+msgstr "Autor"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "Autor"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "Autor"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "Enviar mensaxes en formato HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Previsualiza a mensaxe que se vai imprimir"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "Enviar mensaxes en formato HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Borrar esta mensaxe"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Gardar Anexo"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show _attachments"
+msgstr "anexo"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "anexo"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "Abrir..."
+
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:7
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Engadir a carpeta А sЗa lista de carpetas subscritas"
 
-#: ui/evolution-subscribe.xml.h:10
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Actualizar Lista"
 
-#: ui/evolution-subscribe.xml.h:11
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Actualizar Lista de Carpetas"
 
-#: ui/evolution-subscribe.xml.h:12
+#: po/tmp/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"
 
-#: ui/evolution-subscribe.xml.h:14
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Subscribir"
 
-#: ui/evolution-subscribe.xml.h:15
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Desubscribir"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:7
-msgid "Create a new folder"
-msgstr "Crear unha nova carpeta"
-
-#: ui/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Visualizar unha carpeta diferente"
 
-#: ui/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_SaМr"
 
-#: ui/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "_Atallo da barra do Evolution"
 
-#: ui/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "SaМr do programa"
 
-#: ui/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "_IniciaciСn"
 
-#: ui/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Amosar informaciСn sobre o Evolution"
 
-#: ui/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Amosar a Barra de _Carpetas"
 
-#: ui/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Amosar a Barra de _Atallos"
 
-#: ui/evolution.xml.h:16
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "_Enviar un Informe de Erro"
+
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un informe de erro usando o Bug Buddy"
 
-#: ui/evolution.xml.h:17
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr ""
 
-#: ui/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr ""
 
-#: ui/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Uso do Xestor de Co_ntactos"
 
-#: ui/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Uso da _Axenda"
 
-#: ui/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Uso do Cliente de _Correo"
 
-#: ui/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Acerca do Evolution..."
 
-#: ui/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Cita (FIXME)"
 
-#: ui/evolution.xml.h:24
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Contacto (FIXME)"
 
-#: ui/evolution.xml.h:25
-msgid "_Create New Folder..."
-msgstr "_Crear unha Nova Carpeta..."
-
-#: ui/evolution.xml.h:28
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: ui/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Ir para a Carpeta..."
 
-#: ui/evolution.xml.h:31
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "м_ndice"
 
-#: ui/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr ""
 
-#: ui/evolution.xml.h:34
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_ConfiguraciСn"
 
-#: ui/evolution.xml.h:35
-msgid "_Submit Bug Report"
-msgstr "_Enviar un Informe de Erro"
-
-#: ui/evolution.xml.h:36
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d de %B de %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr ""
@@ -6849,13 +6650,6 @@ msgstr "Hora do _final da reuniСn:"
 msgid "All Attendees"
 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:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d de %B de %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6865,25 +6659,186 @@ msgstr "%B de %Y"
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "Agora"
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "Agora"
-
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "©EstА seguro de que quere\n"
+#~ "borrar este contacto?"
+
+#~ msgid "window2"
+#~ msgstr "window2"
+
+#~ msgid "Priority:"
+#~ msgstr "Prioridade:"
+
+#~ msgid "Time format"
+#~ msgstr "Formato da hora"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 horas (AM/PM)"
+
+#~ msgid "24-hour"
+#~ msgstr "24 horas"
+
+#~ msgid "Weeks start on"
+#~ msgstr "A semana comeza o"
+
+#~ msgid "Preferences"
+#~ msgstr "Preferencias"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmas"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "Propiedades da Alarma"
+
+#~ msgid "Audio alarms timeout after"
+#~ msgstr "As alarmas sonoras expiran tras"
+
+#~ msgid " seconds"
+#~ msgstr " segundos"
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Non foi posible renomear a carpeta %s a %s: o destino xa existe"
+
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Non И posible copiar os datos С ficheiro de saМda: %s"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Non foi posible renomear a carpeta `%s': %s existe"
+
+#~ 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"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Non foi posible executar %s: %s\n"
+
+#~ msgid " (XXX unread)"
+#~ msgstr " (XXX sen ler)"
+
+#~ 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 d3f602fa9b..79c2931d8d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution VERSION\n"
-"POT-Creation-Date: 2000-11-08 16:33+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -9,158 +9,305 @@ msgstr ""
 "Content-Type: text/plain; charset=8859-2\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3044
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr "KАrtya:"
 
-#: addressbook/backend/ebook/e-card.c:3046
-msgid "\nName: "
-msgstr "\nNИv:  "
-
-#: addressbook/backend/ebook/e-card.c:3047
-msgid "\n  Prefix:     "
-msgstr "\n ElУtag:      "
-
 #: addressbook/backend/ebook/e-card.c:3048
-msgid "\n  Given:      "
-msgstr "\n  Adott:      "
+msgid ""
+"\n"
+"Name: "
+msgstr ""
+"\n"
+"NИv:  "
 
 #: addressbook/backend/ebook/e-card.c:3049
-msgid "\n  Additional: "
-msgstr "\n  EgyИb:      "
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+"\n"
+" ElУtag:      "
 
 #: addressbook/backend/ebook/e-card.c:3050
-msgid "\n  Family:     "
-msgstr "\n  CsalАdi:    "
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+"\n"
+"  Adott:      "
 
 #: addressbook/backend/ebook/e-card.c:3051
-msgid "\n  Suffix:     "
-msgstr "\n  UtСtag:     "
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+"\n"
+"  EgyИb:      "
 
-#: addressbook/backend/ebook/e-card.c:3065
-msgid "\nBirth Date: "
-msgstr "\nSzЭletИsi dАtum: "
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+"\n"
+"  CsalАdi:    "
 
-#: addressbook/backend/ebook/e-card.c:3076
-msgid "\nAddress:"
-msgstr "\nCМm:"
+#: addressbook/backend/ebook/e-card.c:3053
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+"\n"
+"  UtСtag:     "
 
-#: addressbook/backend/ebook/e-card.c:3078
-msgid "\n  Postal Box:  "
-msgstr "\n  PostafiСk:   "
+#: addressbook/backend/ebook/e-card.c:3067
+msgid ""
+"\n"
+"Birth Date: "
+msgstr ""
+"\n"
+"SzЭletИsi dАtum: "
 
-#: addressbook/backend/ebook/e-card.c:3079
-msgid "\n  Ext:         "
-msgstr "\n KЭl:"
+#: addressbook/backend/ebook/e-card.c:3078
+msgid ""
+"\n"
+"Address:"
+msgstr ""
+"\n"
+"CМm:"
 
 #: addressbook/backend/ebook/e-card.c:3080
-msgid "\n  Street:      "
-msgstr "\n  зt:          "
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+"\n"
+"  PostafiСk:   "
 
 #: addressbook/backend/ebook/e-card.c:3081
-msgid "\n  City:        "
-msgstr "\n  VАros:       "
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+"\n"
+" KЭl:"
 
 #: addressbook/backend/ebook/e-card.c:3082
-msgid "\n  Region:      "
-msgstr "\n  RИgiС:       "
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+"\n"
+"  зt:          "
 
 #: addressbook/backend/ebook/e-card.c:3083
-msgid "\n  Postal Code: "
-msgstr "\n IrАnyМtСszАm: "
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+"\n"
+"  VАros:       "
 
 #: addressbook/backend/ebook/e-card.c:3084
-msgid "\n  Country:     "
-msgstr "\n  OrszАg:      "
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+"\n"
+"  RИgiС:       "
 
-#: addressbook/backend/ebook/e-card.c:3097
-msgid "\nDelivery Label: "
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
 msgstr ""
+"\n"
+" IrАnyМtСszАm: "
 
-#: addressbook/backend/ebook/e-card.c:3109
-msgid "\nTelephones:\n"
-msgstr "\nTelefonok:\n"
+#: addressbook/backend/ebook/e-card.c:3086
+msgid ""
+"\n"
+"  Country:     "
+msgstr ""
+"\n"
+"  OrszАg:      "
 
-#: addressbook/backend/ebook/e-card.c:3112
-msgid "\nTelephone:"
-msgstr "\nTelefon:"
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3136
-msgid "\nE-mail:\n"
-msgstr "\nE-mail:\n"
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+"\n"
+"Telefonok:\n"
 
-#: addressbook/backend/ebook/e-card.c:3139
-msgid "\nE-mail:"
-msgstr "\nE-mail:"
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+"\n"
+"Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3158
-msgid "\nMailer: "
-msgstr "\nLevelezУ: "
+#: addressbook/backend/ebook/e-card.c:3138
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr ""
+"\n"
+"E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:3164
-msgid "\nTime Zone: "
-msgstr "\nIdУzСna: "
+#: addressbook/backend/ebook/e-card.c:3141
+msgid ""
+"\n"
+"E-mail:"
+msgstr ""
+"\n"
+"E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:3172
-msgid "\nGeo Location: "
-msgstr "\nHely: "
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+"\n"
+"LevelezУ: "
 
-#: addressbook/backend/ebook/e-card.c:3176
-msgid "\nBusiness Role: "
-msgstr "\nэzleti szabАly:"
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+"\n"
+"IdУzСna: "
 
-#: addressbook/backend/ebook/e-card.c:3188
-msgid "\nOrg: "
-msgstr "\nCИg:"
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+"\n"
+"Hely: "
 
-#: addressbook/backend/ebook/e-card.c:3189
-msgid "\n  Name:  "
-msgstr "\n NИv:"
+#: addressbook/backend/ebook/e-card.c:3178
+msgid ""
+"\n"
+"Business Role: "
+msgstr ""
+"\n"
+"эzleti szabАly:"
 
 #: addressbook/backend/ebook/e-card.c:3190
-msgid "\n  Unit:  "
-msgstr "\n EgysИg:"
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+"\n"
+"CИg:"
 
 #: addressbook/backend/ebook/e-card.c:3191
-msgid "\n  Unit2: "
-msgstr "\n 2. egysИg:"
+msgid ""
+"\n"
+"  Name:  "
+msgstr ""
+"\n"
+" NИv:"
 
 #: addressbook/backend/ebook/e-card.c:3192
-msgid "\n  Unit3: "
-msgstr "\n 3. egysИg:"
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+"\n"
+" EgysИg:"
 
 #: addressbook/backend/ebook/e-card.c:3193
-msgid "\n  Unit4: "
-msgstr "\n 4. egysИg:"
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+"\n"
+" 2. egysИg:"
+
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+"\n"
+" 3. egysИg:"
 
-#: addressbook/backend/ebook/e-card.c:3197
-msgid "\nCategories: "
-msgstr "\nKategСriАk:"
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+"\n"
+" 4. egysИg:"
 
-#: addressbook/backend/ebook/e-card.c:3198
-msgid "\nComment: "
-msgstr "\nMegjegyzИs:"
+#: addressbook/backend/ebook/e-card.c:3199
+msgid ""
+"\n"
+"Categories: "
+msgstr ""
+"\n"
+"KategСriАk:"
 
-#: addressbook/backend/ebook/e-card.c:3211
-msgid "\nUnique String: "
-msgstr "\nEgyedi szЖveg:"
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+"\n"
+"MegjegyzИs:"
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+"\n"
+"Egyedi szЖveg:"
 
-#: addressbook/backend/ebook/e-card.c:3214
-msgid "\nPublic Key: "
-msgstr "\nNyilvАnos kulcs:"
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
+"\n"
+"NyilvАnos kulcs:"
 
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: 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:910
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1091
-#: calendar/conduits/todo/todo-conduit.c:965
-#: calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Nem tudom a bonobo-t elindМtani"
 
+#. This array must be in the same order as enumerations
+#. in GnomePilotConduitSyncType as they are used as index.
+#. Custom type implies Disabled state.
+#.
 #: addressbook/conduit/address-conduit-control-applet.c:77
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
 #: calendar/conduits/todo/todo-conduit-control-applet.c:77
@@ -253,8 +400,12 @@ msgstr "Csatorna Аllapot"
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
 #: calendar/conduits/todo/todo-conduit-control-applet.c:266
 #: calendar/conduits/todo/todo-conduit-control-applet.c:279
-msgid "No pilot configured, please choose the\n'Pilot Link Properties' capplet first."
-msgstr "Nincs pilot beАllМtva, kИrlek vАlaszd ki a\n'Pilot Link Properties' cappletet elУszЖr."
+msgid ""
+"No pilot configured, please choose the\n"
+"'Pilot Link Properties' capplet first."
+msgstr ""
+"Nincs pilot beАllМtva, kИrlek vАlaszd ki a\n"
+"'Pilot Link Properties' cappletet elУszЖr."
 
 #: addressbook/conduit/address-conduit-control-applet.c:285
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
@@ -265,34 +416,43 @@ msgstr "Nincs a gnome-pilot daemonra kapcsolСdva"
 #: addressbook/conduit/address-conduit-control-applet.c:290
 #: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
 #: calendar/conduits/todo/todo-conduit-control-applet.c:290
-msgid "An error occured when trying to fetch\npilot list from the gnome-pilot daemon"
-msgstr "Hiba lИpett fel a pilotok listАjАnak\na gnome-pilot daemontСl valС lekИrИsekor "
+msgid ""
+"An error occured when trying to fetch\n"
+"pilot list from the gnome-pilot daemon"
+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:193
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "A kurzort nem tudom betЖlteni\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "Az EBook nincs betЖltve\n"
 
-#: addressbook/conduit/address-conduit.c:490
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Nem tudom elindМtani a wombat szervert"
 
-#: addressbook/conduit/address-conduit.c:491
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Nem tudom a wombat-ot elindМtani"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 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"
@@ -305,113 +465,25 @@ msgstr "Az elemek az alАbbi kategСriАkhoz tartoznak:"
 msgid "Available Categories:"
 msgstr "MeglИvУ mezУk"
 
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Assistant"
-msgstr "Asszisztens"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-#: addressbook/contact-editor/e-contact-editor.c:1339
-msgid "Business"
-msgstr "эzleti"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "Business 2"
-msgstr "2. эzleti"
-
-#: addressbook/contact-editor/e-contact-editor.c:1237
-msgid "Business Fax"
-msgstr "эzleti fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1238
-msgid "Callback"
-msgstr "VisszahМvАs"
-
-#: addressbook/contact-editor/e-contact-editor.c:1239
-msgid "Car"
-msgstr "AutС"
-
-#: addressbook/contact-editor/e-contact-editor.c:1240
-msgid "Company"
-msgstr "VАllalat"
-
-#: addressbook/contact-editor/e-contact-editor.c:1241
-#: addressbook/contact-editor/e-contact-editor.c:1340
-msgid "Home"
-msgstr "Otthoni"
-
-#: addressbook/contact-editor/e-contact-editor.c:1242
-msgid "Home 2"
-msgstr "2. Otthoni"
-
-#: addressbook/contact-editor/e-contact-editor.c:1243
-msgid "Home Fax"
-msgstr "Otthoni fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1244
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1245
-msgid "Mobile"
-msgstr "Mobil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1246
-#: addressbook/contact-editor/e-contact-editor.c:1341
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "MАs"
-
-#: addressbook/contact-editor/e-contact-editor.c:1247
-msgid "Other Fax"
-msgstr "EgyИb fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1248
-msgid "Pager"
-msgstr "SzemИlyhМvС"
-
-#: addressbook/contact-editor/e-contact-editor.c:1249
-msgid "Primary"
-msgstr "ElsУdleges"
-
-#: addressbook/contact-editor/e-contact-editor.c:1250
-msgid "Radio"
-msgstr "RАdiС"
-
-#: addressbook/contact-editor/e-contact-editor.c:1251
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1252
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1296
-msgid "Primary Email"
-msgstr "ElsУdleges email"
-
-#: addressbook/contact-editor/e-contact-editor.c:1297
-msgid "Email 2"
-msgstr "2. email"
-
-#: addressbook/contact-editor/e-contact-editor.c:1298
-msgid "Email 3"
-msgstr "3. email"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid "Are you sure you want\nto delete this contact?"
-msgstr "TИnyleg tЖrЖlni akarod\nezt a nИvjegyet?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#.
+#. * 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
 msgid "Delete Contact?"
 msgstr "NИvjegy tЖrlИse?"
 
+#.
+#. * 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/e-contact-editor-strings.h:7
 msgid "_Add"
 msgstr "HozzА_ad"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-contact-editor.xml:37
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_TЖrЖl"
 
@@ -424,15 +496,13 @@ msgstr "Telefon tМpusok"
 msgid "New phone type"
 msgstr "зj telefon tМpus"
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: filter/filter.glade.h:12
-#: filter/filter.glade.h:17
-#: filter/filter.glade.h:21
-#: filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "HozzАad"
 
@@ -472,6 +542,11 @@ msgstr "эzleti _fax"
 msgid "_Mobile"
 msgstr "_Mobil"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "ElsУdleges email"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "эz_leti"
@@ -485,7 +560,7 @@ msgid "C_ontacts..."
 msgstr "_NИvjegyek..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegСriАk..."
 
@@ -502,7 +577,7 @@ msgid "_Address..."
 msgstr "_CМm..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Alap"
 
@@ -547,65 +622,179 @@ msgid "No_tes:"
 msgstr "Felje_gyzИsek:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "RИszletek"
 
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Asszisztens"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "эzleti"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "2. эzleti"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "эzleti fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "VisszahМvАs"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "AutС"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "VАllalat"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Otthoni"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "2. Otthoni"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Otthoni fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "MАs"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "EgyИb fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "SzemИlyhМvС"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "ElsУdleges"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "RАdiС"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "2. email"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "3. email"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "2.cМm:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Kanada"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "A cМm ellenУrzИse"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Ors_zАg:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "FinnorszАg"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "USA"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_CМm:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_VАros:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_PostafiСk:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "2.cМm:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "а_llam/HelytartСsАg:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "USA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "FinnorszАg"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_IrАnyМtСszАm:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "Ors_zАg:"
-
+#.
+#. * 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/fullname-strings.h:7
 msgid "Check Full Name"
 msgstr "A teljes nИv ellenУrzИse"
 
 #: addressbook/contact-editor/fullname-strings.h:8
-msgid "\nMr.\nMrs.\nDr.\n"
-msgstr "\nDr.\nProf.\n"
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Dr.\n"
+msgstr ""
+"\n"
+"Dr.\n"
+"Prof.\n"
 
 #: addressbook/contact-editor/fullname-strings.h:13
-msgid "\nSr.\nJr.\nI\nII\nIII\nEsq.\n"
-msgstr "\nIfj.\nжzv.\n"
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq.\n"
+msgstr ""
+"\n"
+"Ifj.\n"
+"жzv.\n"
 
 #: addressbook/contact-editor/fullname-strings.h:21
 msgid "_First:"
@@ -627,11 +816,16 @@ msgstr "_VezetИknИv:"
 msgid "_Suffix:"
 msgstr "_ElУtag:"
 
-#: addressbook/gui/component/addressbook.c:265
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "_KАrtyАkkИnt"
 
-#: addressbook/gui/component/addressbook.c:271
+#.
+#. * 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
 msgid "As _Table"
 msgstr "_TАblАzatkИnt"
 
@@ -640,16 +834,31 @@ msgid "Unable to open addressbook"
 msgstr "Nem tudom megnyitni a cМmjegyzИket"
 
 #: addressbook/gui/component/addressbook.c:391
-msgid "We were unable to open this addressbook.  This either\nmeans you have entered an incorrect URI, or have tried\nto access an LDAP server and don't have LDAP support\ncompiled in.  If you've entered a URI, check the URI for\ncorrectness and reenter.  If not, you probably have\nattempted to access an LDAP server.  If you wish to be\nable to use LDAP, you'll need to download and install\nOpenLDAP and recompile and install evolution.\n"
-msgstr "Nem tudom a cМmjegyzИket megnyitni. Ez azt jelenti,\nhogy hibАs URI-t МrtАl be, vagy egy LDAP szervert\nszeretnИl elИrni, Иs nincs LDAP tАmogatАs befordМtva.\nHa URI-t МrtАl be, ellenУrizd az URI-t elМrАs vagy\nhelytelen szintaktika szempontjАbСl. Ha nem,\nlehet, hogy egy LDAP szervert kИne elИrned. Ha szeretnИl\nhasznАlni egy LDAP szervert, le kell tЖltened Иs\ntelepМtened az OpenLDAP csomagot, Иs ЗjrafordМtani az EvolЗciСt.\n"
-
-#: addressbook/gui/component/addressbook.c:501
-#: mail/folder-browser.c:152
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either\n"
+"means you have entered an incorrect URI, or have tried\n"
+"to access an LDAP server and don't have LDAP support\n"
+"compiled in.  If you've entered a URI, check the URI for\n"
+"correctness and reenter.  If not, you probably have\n"
+"attempted to access an LDAP server.  If you wish to be\n"
+"able to use LDAP, you'll need to download and install\n"
+"OpenLDAP and recompile and install Evolution.\n"
+msgstr ""
+"Nem tudom a cМmjegyzИket megnyitni. Ez azt jelenti,\n"
+"hogy hibАs URI-t МrtАl be, vagy egy LDAP szervert\n"
+"szeretnИl elИrni, Иs nincs LDAP tАmogatАs befordМtva.\n"
+"Ha URI-t МrtАl be, ellenУrizd az URI-t elМrАs vagy\n"
+"helytelen szintaktika szempontjАbСl. Ha nem,\n"
+"lehet, hogy egy LDAP szervert kИne elИrned. Ha szeretnИl\n"
+"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
 msgid "Show All"
 msgstr "Mutasd mind"
 
-#: addressbook/gui/component/addressbook.c:503
-#: mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr "HaladС..."
 
@@ -673,157 +882,169 @@ msgstr "Az URI amit a Mappa BЖngИszУ meg fog nyitni"
 msgid "External Directories"
 msgstr "KЭlsУ kЖnyvtАrak"
 
-#: 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 "LeМrАs:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "LDAP szerver:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "NИv:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "PortszАm:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr "Root DN:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-msgstr "NИv:"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/select-names.glade.h:6
+msgid "Find..."
+msgstr "KeresИs..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "LevИl cМmzettek"
+
+#: po/tmp/select-names.glade.h:8
 msgid "Select Names"
 msgstr "VАlassz neveket"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Find..."
-msgstr "KeresИs..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "VАlassz egy nevet a listАbСl:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "LevИl cМmzettek"
-
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "2.ablak"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "KeresИs"
 
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "VCard-kИnt mentИs"
@@ -833,197 +1054,200 @@ msgid "Save in addressbook"
 msgstr "CМmjegyzИkbe mentИs"
 
 #: addressbook/gui/widgets/e-minicard-view.c:111
-msgid "\n\nThere are no items to show in this view\n\nDouble-click here to create a new Contact."
-msgstr "\n\nNincsenek elemek, amiket meg lehetne mutatni\n\nзj nИvjegy kИszМtИsИhez kattints kettУt ide."
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Nincsenek elemek, amiket meg lehetne mutatni\n"
+"\n"
+"зj nИvjegy kИszМtИsИhez kattints kettУt ide."
+
+#.
+#. * 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
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "KeresИs"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Oldal beАllМtАs:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "A vИgИn a formok ЭrМtИse:"
 
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "StМlus neve:"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "TЖrzs"
 
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "ElУnИzet:"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "AlsС:"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "BeАllМtАsok"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "DimenziСk:"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "BeleИrtve:"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "BetШtМpus..."
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "SzekciСk:"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "BetШtМpusok"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "RЖgtЖn egymАs utАn kЖvetkeznek"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "LАblИc:"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "LevИl cМmkИk minden lapon"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "FormАtum"
+
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "FejlИc"
+
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "FejlИc/lАblИc"
+
+#: po/tmp/e-contact-print.glade.h:18
+msgid "Headings"
+msgstr "FejlИcek"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: po/tmp/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr "FejlИc minden levИlnek"
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "зj lapon kezdd"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "MagassАg:"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "Oszlopok szАma:"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr "RЖgtЖn egymАs utАn kЖvetkeznek"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "A vИgИn a formok ЭrМtИse:"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "BeleИrtve:"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "BetШtМpusok"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "FekvУ"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "BetШtМpus..."
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Bal:"
 
-#: addressbook/printing/e-contact-print.glade.h:22
-msgid "Headings"
-msgstr "FejlИcek"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "LevИl cМmkИk minden lapon"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "MargСk"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "TЖrzs"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "Oszlopok szАma:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "BeАllМtАsok"
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "аrnyalАs"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "ElhelyezkedИs"
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "NyomatАs szЭrkeskАlАs АrnyalАssal"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Lap"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "FormАtum"
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "Oldal beАllМtАs:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
+#: po/tmp/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "PapМr"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "TМpus"
-
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "label26"
-msgstr "label26"
-
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "DimenziСk:"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "SzИlessИg:"
-
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "MagassАg:"
-
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "PapМr forrАs:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "MargСk"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "аllС"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "FelsУ:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "ElУnИzet:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "AlsС:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "NyomatАs szЭrkeskАlАs АrnyalАssal"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Bal:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "PАros lapokon fordМtott"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Jobb:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Lap"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "SzekciСk:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "аrnyalАs"
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "MИret:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "ElhelyezkedИs"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "аllС"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "зj lapon kezdd"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "FekvУ"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "StМlus neve:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "FejlИc"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "FelsУ:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "LАblИc:"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "TМpus"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "PАros lapokon fordМtott"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "SzИlessИg:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "FejlИc/lАblИc"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "label26"
 
-#: calendar/cal-util/timeutil.c:98
-#: calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "de"
 
-#: calendar/cal-util/timeutil.c:98
-#: calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "du"
 
@@ -1035,13 +1259,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:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "HibАs kommunikАciС a naptАr szerverrel"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nem tudom a pilot Calendar application blokkjАt olvasni"
 
@@ -1053,8 +1277,8 @@ 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:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem tudom a pilot Calendar ToDo blokkjАt olvasni"
 
@@ -1098,51 +1322,50 @@ msgstr "TennivalС, ami ma jАr le:"
 msgid "To-Do item that is overdue:"
 msgstr "TennivalС, ami lejАrt:"
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Nem talАlom a fАjlt"
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "NaptАr megnyitАsa"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "NaptАr mentИse"
 
+#. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr "%a %m/%d/%Y"
 
-#: calendar/gui/calendar-model.c:286
-#: calendar/gui/calendar-model.c:726
+#. 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
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
-#: calendar/gui/calendar-model.c:290
-#: calendar/gui/calendar-model.c:729
+#. 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
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "NyilvАnos"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "SzemИlyes"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/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:353 calendar/gui/calendar-model.c:521
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -1170,50 +1393,65 @@ msgstr "аttetszУ"
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
-msgid "The date must be entered in the format: \n\n%s"
-msgstr "A dАtumot a kЖvetkezУ formАban tudod beМrni: \n\n%s"
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"A dАtumot a kЖvetkezУ formАban tudod beМrni: \n"
+"\n"
+"%s"
 
-#: calendar/gui/calendar-model.c:835
-#: calendar/gui/calendar-model.c:883
+#. strptime format for a date.
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228
-#: widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545
-#: widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
-#: calendar/gui/calendar-model.c:853
+#. 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
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
-#: calendar/gui/calendar-model.c:856
+#. strptime format for a time of day, in 24-hour format.
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
-#: calendar/gui/calendar-model.c:860
+#. 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
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
-#: calendar/gui/calendar-model.c:863
+#. strptime format for time of day, without seconds 24-hour format.
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
-msgid "The geographical position must be entered in the format: \n\n45.436845,125.862501"
-msgstr "A fЖldrajzi pozМciС megadАsa a kЖvetkezУ formАtumban lehetsИges: \n\n45.436845,125.862501"
+#: calendar/gui/calendar-model.c:993
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"A fЖldrajzi pozМciС megadАsa a kЖvetkezУ formАtumban lehetsИges: \n"
+"\n"
+"45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "A szАzalИkos ИrtИk 0 Иs 100 kЖzЖtt lehet, bezАrСlag"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 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/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "Az URI amit a naptАr megjelenМt"
 
@@ -1229,688 +1467,668 @@ msgstr "TalАlkozС figyelmeztetИs: %A %b %d %Y %H:%M"
 msgid "No summary available."
 msgstr "Nincs elИrhetУ ЖsszegzИs."
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
+#.
+#. * 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
 msgid "Close"
 msgstr "BezАr"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8
-#: calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Szundi"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "_IdУpont szerkesztИse"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Szundi"
+
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr "Szundi idУ (percek)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "NaptАr beАllМtАsok"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "MunkahИt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "HИ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ke"
+#.
+#. * 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
+msgid "05 minutes"
+msgstr "05 perc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Sze"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 perc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "CsЭ"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 СrАs (de/du)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "PИ"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 perc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Szo"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 СrАs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Va"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 perc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "A hИt elsУ napja:"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 perc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor.c:368
-#: calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "HИtfУ"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor.c:369
-msgid "Tuesday"
-msgstr "Kedd"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "Hang figyelmeztetИs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor.c:370
-msgid "Wednesday"
-msgstr "Szerda"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr "SМpolj a figyelmeztetУ ablak megjelenИsekor."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor.c:371
-msgid "Thursday"
-msgstr "CsЭtЖrtЖk"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "NaptАr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor.c:372
-msgid "Friday"
-msgstr "PИntek"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "NaptАr beАllМtАsok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor.c:373
-msgid "Saturday"
-msgstr "Szombat"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "SzМnek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor.c:374
-#: calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "VasАrnap"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr "A hИtvИgИk ЖsszenyomАsa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "Nap kezdete:"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr "DАtum navigАtor beАllМtАsok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Nap vИge:"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "AlapИrtelmezett"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "MegjelenМtИsi beАllМtАsok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "IdУosztАsok:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "IdУ formАtum:"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "LejАrat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
-msgstr "Mutasd az esemИnyek vИgpontjАt"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "Enable snoozing for"
+msgstr "Szundi engedИse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
-msgstr "A hИtvИgИk ЖsszenyomАsa"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Nap vИge:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 СrАs (de/du)"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "A hИt elsУ napja:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 СrАs"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "PИ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 perc"
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "PИntek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 perc"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr "KiemelИs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 perc"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr "A ma lejАrС elemek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 perc"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr "A ma lejАrС elemek:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 perc"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr "MИg nem lejАrt elemek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Date navigator options"
-msgstr "DАtum navigАtor beАllМtАsok"
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
+msgstr "MИg nem lejАrt elemek:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
-msgstr "HИt szАmАnak mutatАsa"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "HИ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "NaptАr"
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "HИtfУ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
-msgstr "Mutasd"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr "LejАrt elemek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "LejАrat"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr "LejАrt elemek:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr "LejАratig hАtralИvУ idУ"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "VАlassz egy szМnt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "PrioritАs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr "KiemelИs"
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr "Minden talАlkozСra figyelmeztess"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
-msgstr "LejАrt elemek"
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr "EmlИkeztetУk"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Items Due Today"
-msgstr "A ma lejАrС elemek"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "Szo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
-msgstr "MИg nem lejАrt elemek"
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Szombat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "SzМnek"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr "Mutasd"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "VАlassz egy szМnt"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr "Mutasd az esemИnyek vИgpontjАt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Items Not Yet Due:"
-msgstr "MИg nem lejАrt elemek:"
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "HИt szАmАnak mutatАsa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
-msgstr "A ma lejАrС elemek:"
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "Nap kezdete:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Overdue Items:"
-msgstr "LejАrt elemek:"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "Va"
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "VasАrnap"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "FeladatTАbla"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
-#: calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "AlapИrtelmezett"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "CsЭ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Remind me of all appointments"
-msgstr "Minden talАlkozСra figyelmeztess"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "CsЭtЖrtЖk"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
-msgstr "perc bekЖvetkezИsЭkig."
+#: po/tmp/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
+msgid "Time divisions:"
+msgstr "IdУosztАsok:"
+
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr "IdУ formАtum:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "Ke"
+
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Kedd"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "VizuАlis figyelmeztetИs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr "SМpolj a figyelmeztetУ ablak megjelenИsekor."
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "Sze"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
-msgstr "Hang figyelmeztetИs"
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Szerda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "MunkahИt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: po/tmp/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
 msgid "seconds."
 msgstr "mАsodperc."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-#, fuzzy
-msgid "Enable snoozing for"
-msgstr "Szundi engedИse"
+#.
+#. * 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
+msgid "% Comp_lete:"
+msgstr "% kИsz:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
-msgstr "EmlИkeztetУk"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "B_esorolАs"
 
-#: calendar/gui/dialogs/task-editor.c:655
-msgid "Edit Task"
-msgstr "Feladat vИge"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "TЖrЖlve"
 
-#: calendar/gui/dialogs/task-editor.c:661
-#: calendar/gui/event-editor.c:307
-msgid "No summary"
-msgstr "Nincs ЖsszegzИs"
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
+msgstr "ElvИgezve"
 
-#: calendar/gui/dialogs/task-editor.c:667
-#: calendar/gui/event-editor.c:313
-#, c-format
-msgid "Appointment - %s"
-msgstr "IdУpont - %s"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "TeljesМtИs dАtuma:"
 
-#: calendar/gui/dialogs/task-editor.c:670
-#: calendar/gui/event-editor.c:316
-#, c-format
-msgid "Task - %s"
-msgstr "Feladat - %s"
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
+msgstr "Magas"
 
-#: calendar/gui/dialogs/task-editor.c:673
-#: calendar/gui/event-editor.c:319
-#, c-format
-msgid "Journal entry - %s"
-msgstr "NaplС bejegyzИs - %s"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "Folyamatban"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
+#: po/tmp/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
+msgid "None"
+msgstr "Semmi"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "NormАlis"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Nem indult mИg el"
+
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr "ж_sszegzИs"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Ke_zdИsi dАtum:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
-msgstr "Le_jАrat:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "% Comp_lete:"
-msgstr "% kИsz:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "_StАtusz:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Nem indult mИg el"
+#: po/tmp/task-editor-dialog.glade.h:24
+msgid "Task"
+msgstr "Feladat"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "Folyamatban"
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
+msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
-msgstr "ElvИgezve"
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "_NИvjegyek..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "TЖrЖlve"
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr "Le_jАrat:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_PrioritАs:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "High"
-msgstr "Magas"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "NormАlis"
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "_StАtusz:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
-msgid "Low"
-msgstr "Alacsony"
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr "task-editor-dialog"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "B_esorolАs"
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Feladat vИge"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: shell/e-shell-view.c:1017
-#: widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371
-#: widgets/misc/e-dateedit.c:1171
-msgid "None"
-msgstr "Semmi"
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Nincs ЖsszegzИs"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_NИvjegyek..."
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "IdУpont - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "Task"
-msgstr "Feladat"
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "TeljesМtИs dАtuma:"
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "NaplС bejegyzИs - %s"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "URL:"
-msgstr "URL:"
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:294
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Megnyit..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "A feladat megnyitАsa"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "KИsznek jelЖl"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "MegjelЖlИs mint kИsz feladat"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: filter/filter.glade.h:14
-#: filter/filter.glade.h:19
-#: filter/libfilter-i18n.h:8
-#: mail/folder-browser.c:476
-#: mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24
-#: mail/mail-view.c:165
+#: 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:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "A feladat tЖrlИse"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i perces osztАs"
 
-#: calendar/gui/e-day-view-top-item.c:261
-#: calendar/gui/e-day-view.c:1172
+#. 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-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-#: calendar/gui/e-day-view-top-item.c:265
-#: calendar/gui/e-day-view.c:1186
+#. 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-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: calendar/gui/e-day-view-top-item.c:269
-#: calendar/gui/e-day-view.c:1199
+#. 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-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634
-#: calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650
-#: calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939
-#: calendar/gui/e-week-view.c:2948
+#: 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
 msgid "New appointment..."
 msgstr "зj _idУpont"
 
-#: calendar/gui/e-day-view.c:2638
-#: calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936
-#: calendar/gui/e-week-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "A megbeszИlИs szerkesztИse..."
 
-#: calendar/gui/e-day-view.c:2639
-#: calendar/gui/e-week-view.c:2937
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "A megbeszИlИs tЖrlИse"
 
-#: calendar/gui/e-day-view.c:2646
-#: calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "A megbeszИlИs mozgathatСvА tИtele"
 
-#: calendar/gui/e-day-view.c:2647
-#: calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "A megjelenИs tЖrlИse"
 
-#: calendar/gui/e-day-view.c:2648
-#: calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Az Жsszes megjelenИs tЖrlИse"
 
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
 #: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:301
-msgid "Edit Appointment"
-msgstr "MegbeszИlИs szerkesztИse"
+#.
+#. * 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
+msgid "A_ll day event"
+msgstr "Minden napos esemИny"
 
-#: calendar/gui/event-editor.c:346
-msgid "on"
-msgstr "ekkor:"
+#: po/tmp/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "MegbeszИlИsek:"
 
-#: calendar/gui/event-editor.c:367
-#: calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "nap"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "BesorolАs"
 
-#: calendar/gui/event-editor.c:417
-msgid "on the"
-msgstr "ezen:"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "Megadott ismИtlУdИs"
 
-#: calendar/gui/event-editor.c:424
-msgid "th"
-msgstr "."
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Napok"
 
-#: calendar/gui/event-editor.c:547
-msgid "ocurrences"
-msgstr "elУfordulАsok"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Minden"
 
-#: calendar/gui/event-editor.c:2481
-#: calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087
-#: calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "KivИtelek"
 
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "сrАk"
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:38
-#, fuzzy
-msgid "Su_mmary:"
-msgstr "жsszegzИs:"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "LevИl _valakinek:"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "IdУ"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Percek"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "_KezdИsi idУ:"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "MСdosМtАs"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "_VИg idУpont:"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Nincs ismИtlУdИs"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
-msgstr "Minden napos esemИny"
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "ElУnИzet:"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "BesorolАs"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "SzemИ_lyes"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
+#: po/tmp/event-editor-dialog.glade.h:23
 msgid "Pu_blic"
 msgstr "Nyil_vАnos"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "SzemИ_lyes"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "IsmИtlУdИs"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
-msgstr "_Bizalmas"
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr "IsmИtlУdИsi szabАly"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Percek"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr "EmlИkeztetУ"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
-msgid "Hours"
-msgstr "сrАk"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr "EgyszerШ ismИtlУdИs"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "Napok"
+#: po/tmp/event-editor-dialog.glade.h:28
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "жsszegzИs:"
+
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "IdУ"
+
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "_Hang"
+
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "_Bizalmas"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
+#: po/tmp/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_MegjelenМt"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr "_Program"
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "_VИg idУpont:"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
+#: po/tmp/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_LevИl"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
-msgstr "LevИl _valakinek:"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Program"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
+#: po/tmp/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "_Program indМtАsa:"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "_Hang"
-
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "Reminder"
-msgstr "EmlИkeztetУ"
-
-#: calendar/gui/event-editor-dialog.glade.h:37
-#, fuzzy
-msgid "Appointment Basics"
-msgstr "MegbeszИlИsek:"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "_KezdИsi idУ:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Ke_zdИsi dАtum:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "Recurrence Rule"
-msgstr "IsmИtlУdИsi szabАly"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "nap"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "No recurrence"
-msgstr "Nincs ismИtlУdИs"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "event-editor-dialog"
 
-#: calendar/gui/event-editor-dialog.glade.h:42
-msgid "Simple recurrence"
-msgstr "EgyszerШ ismИtlУdИs"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
+msgstr "ezИrt:"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Custom recurrence"
-msgstr "Megadott ismИtlУdИs"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr "ЖrЖkkИ"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Every"
-msgstr "Minden"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "label21"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "day(s)"
-msgstr "nap"
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "hСnapban"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "amМg"
+
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "hИten"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "month(s)"
-msgstr "hСnapban"
-
-#: calendar/gui/event-editor-dialog.glade.h:48
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "Иvben"
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "for"
-msgstr "ezИrt:"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "MegbeszИlИs szerkesztИse"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "until"
-msgstr "amМg"
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "ekkor:"
 
-#: calendar/gui/event-editor-dialog.glade.h:51
-msgid "forever"
-msgstr "ЖrЖkkИ"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "nap"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "Exceptions"
-msgstr "KivИtelek"
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr "ezen:"
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-msgid "Modify"
-msgstr "MСdosМtАs"
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr "."
 
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
+msgstr "elУfordulАsok"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-msgid "This appointment has custom recurrence rules that cannot be edited by Evolution.\n\nHowever, the appointment will recur at the appropriate time and will be displayed properly in the calendar views."
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "Recurrence"
-msgstr "IsmИtlУdИs"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2008,13 +2226,11 @@ msgstr "pИntek"
 msgid "saturday"
 msgstr "szombat"
 
-#: calendar/gui/getdate.y:420
-#: filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "Иv"
 
-#: calendar/gui/getdate.y:421
-#: filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "hСnap"
 
@@ -2022,18 +2238,15 @@ msgstr "hСnap"
 msgid "fortnight"
 msgstr "kИt hИt"
 
-#: calendar/gui/getdate.y:423
-#: filter/filter-datespec.c:64
+#: 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
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "Сra"
 
-#: calendar/gui/getdate.y:426
-#: filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "perc"
 
@@ -2041,8 +2254,7 @@ msgstr "perc"
 msgid "min"
 msgstr "perc"
 
-#: calendar/gui/getdate.y:428
-#: filter/filter-datespec.c:68
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "mАsodperc"
 
@@ -2062,8 +2274,7 @@ msgstr "tegnap"
 msgid "today"
 msgstr "ma"
 
-#: calendar/gui/getdate.y:438
-#: filter/filter-datespec.c:533
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
 #: filter/filter-datespec.c:693
 msgid "now"
 msgstr "most"
@@ -2084,6 +2295,7 @@ msgstr "kЖvetkezУ"
 msgid "first"
 msgstr "elsУ"
 
+#. { N_("second"),		tUNUMBER,	2 },
 #: calendar/gui/getdate.y:444
 msgid "third"
 msgstr "harmadik"
@@ -2128,53 +2340,28 @@ msgstr "tizenkettedik"
 msgid "ago"
 msgstr "Сta"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "TennivalС kИszМtИse"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "TennivalС szerkesztИse"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "жsszegzИs:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "LejАrat:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "PrioritАs:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "MegjegyzИsek:"
-
-#: calendar/gui/gnome-cal.c:710
-#: calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: 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/gnome-cal.c:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1155
+#: 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/gnome-cal.c:1166
+#: calendar/gui/gnome-cal.c:1174
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1471
-#: calendar/gui/gnome-cal.c:1526
+#. 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"
@@ -2187,9 +2374,16 @@ msgstr "иv:"
 msgid "Go to date"
 msgstr "DАtumra ugrАs"
 
+#. Instructions
 #: calendar/gui/goto.c:281
-msgid "Please select the date you want to go to.\nWhen you click on a day, you will be taken\nto that date."
-msgstr "KИrlek vАlassz egy dАtumot amire lИpni akarsz.\nHa egy napra kattintassz, arra a dАtumra leszel\ntИve."
+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.c:318
 msgid "Go to today"
@@ -2351,12 +2545,12 @@ msgstr "Szo"
 msgid "Tasks"
 msgstr "Feladatok"
 
+#. Day
 #: calendar/gui/print.c:1066
 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:1080 calendar/gui/print.c:1084
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
@@ -2369,11 +2563,13 @@ msgstr "%a %d %Y"
 msgid "Current week (%s - %s)"
 msgstr "AktuАlis hИt (%s %s %d - %s %d %d)"
 
+#. Month
 #: calendar/gui/print.c:1100
 #, fuzzy
 msgid "Current month (%b %Y)"
 msgstr "AktuАlis hСnap (%a %Y)"
 
+#. Year
 #: calendar/gui/print.c:1107
 msgid "Current year (%Y)"
 msgstr "EzИv (%Y)"
@@ -2382,180 +2578,93 @@ msgstr "EzИv (%Y)"
 msgid "Print Calendar"
 msgstr "NaptАr nyomtatАsa"
 
-#: calendar/gui/print.c:1309
-#: mail/mail-callbacks.c:864
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "NyomtatАsi elУnИzet"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "IdУ mutatАsa"
-
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "IdУ formАtum"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 СrАs (de/du)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 СrАs"
-
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "A hetek kezdete"
-
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Nap tartomАny"
-
-#: calendar/gui/prop.c:375
-msgid "Please select the start and end hours you want\nto be displayed in the day view and week view.\nTimes outside this range will not be displayed\nby default."
-msgstr "KИrlek add meg, hogy mikor kezdУdjЖn Иs mikor\nfejezУdjЖn be a nap Иs a hИt.\nAz ezen kМvЭlesУ idУpontok nem lesznek\nmegjelenМtve."
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "Nap kezdete:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "Nap vИge:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "MegjelenМtИs szМnei"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "TennivalС lista mutatАsa:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "TennivalС lista stМlus beАllМtАsai:"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "LejАrt elemek kivilАgМtАsa"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "VilАgМsd ki a mИg nem lejАrt elemeket"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "A ma lejАrС elemek kivilАgМtАsa"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "TennivalС lista beАllМtАsai"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "TennivalС lista"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "BeАllМtАsok"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "иbresztУk"
-
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "иbresztУ beАllМtАsok"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "иbresztУ kiМrАsАnАl csipogj"
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "Hang ИbreszИs idУzМtИse"
-
-#: calendar/gui/prop.c:820
-#: calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " mАsodperc utАn"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "Szundi engedИse"
-
-#: calendar/gui/weekday-picker.c:345
-#: widgets/misc/e-calendar-item.c:416
+#. 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:347
-#: calendar/gui/weekday-picker.c:437
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "VHKSCPS"
 
-#: camel/camel-movemail.c:96
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr ""
-
-#: camel/camel-movemail.c:133
-#: camel/camel-movemail.c:180
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
 #, fuzzy, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: camel/camel-movemail.c:143
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
 #, c-format
-msgid "Could not open mail file %s: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-movemail.c:153
+#: camel/camel-lock.c:199
 #, c-format
-msgid "Could not open temporary mail file %s: %s"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:194
+#: camel/camel-lock.c:253
 #, c-format
-msgid "Could not test lock file for %s: %s"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:214
+#: camel/camel-movemail.c:99
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Could not check mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:146
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:156
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:197
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:243
 #, fuzzy, c-format
 msgid "Error reading mail file: %s"
 msgstr "FАjl betЖltИsi hiba: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, fuzzy, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "FАjl mentИsi hiba: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, fuzzy, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Ismeretlen hiba)"
 
@@ -2588,6 +2697,10 @@ msgstr ""
 msgid "(unknown host)"
 msgstr "(ismeretlen szerver)"
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -2603,25 +2716,30 @@ msgstr ""
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:486
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:489
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, fuzzy, c-format
-msgid "Could not create directory %s:\n%s"
-msgstr "Nem tudom lИtrehozni a kЖnyvtАrat\n%s\nHiba: %s"
+msgid ""
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
+"Nem tudom lИtrehozni a kЖnyvtАrat\n"
+"%s\n"
+"Hiba: %s"
 
 #: camel/camel-url.c:78
 #, c-format
@@ -2638,6 +2756,17 @@ msgstr ""
 msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, 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
+msgid "Bad authentication response from server."
+msgstr ""
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2648,17 +2777,21 @@ msgstr ""
 msgid "IMAP command failed: %s"
 msgstr "Az IMAP parancs sikertelen: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225
-#: shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+#, 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
 #, 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:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
@@ -2668,7 +2801,7 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2695,7 +2828,8 @@ msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
 #: camel/providers/imap/camel-imap-store.c:247
-msgid "This option will connect to the IMAP server using Kerberos 4 authentication."
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:333
@@ -2705,198 +2839,305 @@ msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:359
 #, c-format
-msgid "Unable to authenticate to IMAP server.\n%s\n\n"
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
 msgstr ""
 
 #: camel/providers/imap/camel-imap-store.c:539
 #, fuzzy, c-format
 msgid "Could not create directory %s: %s"
-msgstr "Nem tudom lИtrehozni a kЖnyvtАrat\n%s\nHiba: %s"
-
-#: camel/providers/mbox/camel-mbox-folder.c:223
-#, fuzzy
-msgid "Could not create summary"
-msgstr "Nem tudom a dialСgust elkИszМteni."
+msgstr ""
+"Nem tudom lИtrehozni a kЖnyvtАrat\n"
+"%s\n"
+"Hiba: %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
-#, c-format
-msgid "Cannot append message to mbox file: %s"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
-#, fuzzy, c-format
-msgid "Cannot get message: %s"
-msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
+#: camel/providers/local/camel-local-provider.c:47
+#, fuzzy
+msgid "UNIX mbox-format mail files (CamelLocal version)"
 msgstr "UNIX mbox formАtumЗ fАjlok"
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
-msgid "For reading mail delivered by the local system, and for storing mail on local disk."
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:118
-#, fuzzy, c-format
-msgid "Could not open file `%s':\n%s"
-msgstr "Nem tudom mАsolni a fАjlokat\n'%s'-be."
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
-#, fuzzy, c-format
-msgid "Folder `%s' does not exist."
-msgstr "A fАjl nem lИtezik."
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:134
-#, fuzzy, c-format
-msgid "Could not create file `%s':\n%s"
-msgstr "Nem tudom a dialСgust elkИszМteni."
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
+#: camel/providers/local/camel-local-store.c:129
 #, fuzzy, c-format
-msgid "`%s' is not a regular file."
+msgid "Store root %s is not a regular directory"
 msgstr "Nem sima fАjl."
 
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
-#, c-format
-msgid "Could not delete folder `%s':\n%s"
-msgstr ""
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:184
-#, c-format
-msgid "Folder `%s' is not empty. Not deleted."
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:222
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s helyi levИl fАjl"
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
-#, c-format
-msgid "Could not open summary %s"
-msgstr ""
-
-#: camel/providers/mbox/camel-mbox-summary.c:688
-#, c-format
-msgid "Cannot open temporary mailbox: %s"
-msgstr ""
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
-msgstr ""
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr ""
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: camel/providers/mbox/camel-mbox-summary.c:776
-#, c-format
-msgid "Error writing to temp mailbox: %s"
-msgstr ""
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "LevИl mozgatАsa mАs mappАba"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: 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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
 #, fuzzy, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Nem tudom mАsolni a fАjlokat\n'%s'-be."
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+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-mh-folder.c:183
+#, fuzzy
+msgid "No such message"
+msgstr "A levИl tovАbbМtАsa"
 
-#: camel/providers/mbox/camel-mbox-summary.c:832
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
-msgid "Could not close source folder %s: %s"
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:841
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, fuzzy, c-format
-msgid "Could not close temp folder: %s"
-msgstr "Nem tudom elkИszМteni a megadott mappАt:\n%s"
+msgid "Folder `%s' does not exist."
+msgstr "A fАjl nem lИtezik."
 
-#: camel/providers/mbox/camel-mbox-summary.c:849
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
 #, fuzzy, c-format
-msgid "Could not rename folder: %s"
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: camel/providers/mbox/camel-mbox-summary.c:861
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "'%s' nem kЖnyvtАr."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
 #, c-format
-msgid "Unknown error: %s"
-msgstr "Ismeretlen hiba: %s"
+msgid "Could not delete folder `%s': %s"
+msgstr ""
 
-#: camel/providers/mh/camel-mh-folder.c:213
+#: camel/providers/local/camel-maildir-store.c:158
 #, fuzzy
-msgid "Could not load or create summary"
-msgstr "Nem tudom a dialСgust elkИszМteni."
+msgid "not a maildir directory"
+msgstr "%s helyi levИlkЖnyvtАr"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
+#: camel/providers/local/camel-mbox-folder.c:251
 #, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s"
+msgid "Cannot append message to mbox file: %s: %s"
 msgstr "LevИl mozgatАsa mАs mappАba"
 
-#: camel/providers/mh/camel-mh-folder.c:405
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
 #, fuzzy, c-format
-msgid "Cannot get message: %s\n  %s"
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
 msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, fuzzy, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Nem tudom mАsolni a fАjlokat\n"
+"'%s'-be."
+
+#: camel/providers/local/camel-mbox-store.c:117
+#, fuzzy, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr "Nem tudom a dialСgust elkИszМteni."
+
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
+#, fuzzy, c-format
+msgid "`%s' is not a regular file."
+msgstr "Nem sima fАjl."
+
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:160
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:112
+#: camel/providers/local/camel-mbox-summary.c:234
 #, c-format
-msgid "Could not open folder `%s':\n%s"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:341
 #, fuzzy, c-format
-msgid "Could not create folder `%s':\n%s"
+msgid "Cannot summarise folder: %s: %s"
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: camel/providers/mh/camel-mh-store.c:136
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, 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
 #, c-format
-msgid "`%s' is not a directory."
-msgstr "'%s' nem kЖnyvtАr."
+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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
-msgid "Could not delete folder `%s': %s"
+msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid "Could not rename folder `%s': %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:194
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
-msgid "Could not rename folder `%s': %s exists"
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
+#: camel/providers/local/camel-mbox-summary.c:604
+#, 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
+#, fuzzy, c-format
+msgid "Could not rename folder: %s"
+msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: camel/providers/mh/camel-mh-store.c:214
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
-msgid "Local mail directory %s"
-msgstr "%s helyi levИlkЖnyvtАr"
+msgid "Unknown error: %s"
+msgstr "Ismeretlen hiba: %s"
+
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "LevИl mozgatАsa mАs mappАba"
+
+#: camel/providers/local/camel-mh-store.c:116
+#, c-format
+msgid "`%s' is not a directory."
+msgstr "'%s' nem kЖnyvtАr."
 
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
@@ -2915,7 +3156,7 @@ msgstr ""
 msgid "Server rejected username/password"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, fuzzy, c-format
 msgid "Message %s not found."
 msgstr "Nem talАlom a fАjlt"
@@ -2954,7 +3195,9 @@ msgid "USENET News via %s"
 msgstr "USENET News %s-rУl"
 
 #: camel/providers/nntp/camel-nntp-store.c:295
-msgid "This option will authenticate with the NNTP server using a plaintext password."
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-store.c:334
@@ -2963,16 +3206,16 @@ msgstr ""
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr "Nincs %s azonosМtСjЗ levИl"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -2982,19 +3225,27 @@ msgid "POP"
 msgstr "POP"
 
 #: camel/providers/pop3/camel-pop3-provider.c:36
-msgid "For connecting to POP servers. The POP protocol can also be used to retrieve mail from certain web mail providers and proprietary email systems."
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:150
-msgid "This option will connect to the POP server using a plaintext password. This is the only option supported by many POP servers."
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:160
-msgid "This option will connect to the POP server using an encrypted password via the APOP protocol. This may not work for all users even on servers that claim to support it."
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:172
-msgid "This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:217
@@ -3014,7 +3265,9 @@ msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
-msgid "Unable to connect to POP server.\nError sending username: %s"
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending username: %s"
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:411
@@ -3023,15 +3276,19 @@ msgid "(Unknown)"
 msgstr "(Ismeretlen)"
 
 #: camel/providers/pop3/camel-pop3-store.c:438
-msgid "Unable to connect to POP server.\nNo support for requested authentication mechanism."
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
 msgstr ""
 
 #: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
-msgid "Unable to connect to POP server.\nError sending password: %s"
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Nincs '%s' mappa."
@@ -3041,7 +3298,9 @@ msgid "Sendmail"
 msgstr "Sendmail"
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:36
-msgid "For delivering mail by passing it to the \"sendmail\" program on the local system."
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
 msgstr ""
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:105
@@ -3118,50 +3377,51 @@ msgstr "%.1fM"
 msgid "%.1fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:301
-#: mail/mail-display.c:117
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "csatolАs"
 
-#: composer/e-msg-composer-attachment-bar.c:397
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "FАjl csatolАsa"
 
-#: composer/e-msg-composer-attachment-bar.c:444
-#: filter/filter.glade.h:22
-#: filter/filter.glade.h:25
-#: shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/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:445
+#: composer/e-msg-composer-attachment-bar.c:465
 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:476
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Csatol..."
 
-#: composer/e-msg-composer-attachment-bar.c:477
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Csatolj egy fАjlt a levИlhez"
 
-#: composer/e-msg-composer-attachment.glade.h:7
+#.
+#. * 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
 msgid "Attachment properties"
 msgstr "CsatolАs beАllМtАsok"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "MIME tМpus:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "FАjlnИv:"
 
-#: composer/e-msg-composer-hdrs.c:137
-#: composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:599
+#: po/tmp/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
 msgid "From:"
 msgstr "FeladС:"
 
@@ -3174,8 +3434,7 @@ msgstr "CМmjegyzИkben valС keresИshez kattints ide"
 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:603
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "To:"
 
@@ -3183,8 +3442,7 @@ msgstr "To:"
 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:605
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -3197,11 +3455,14 @@ msgid "Bcc:"
 msgstr "Bcc:"
 
 #: composer/e-msg-composer-hdrs.c:307
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
-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"
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+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:607
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "TИma:"
 
@@ -3209,82 +3470,93 @@ msgstr "TИma:"
 msgid "Enter the subject of the mail"
 msgstr "мrd be a levИl cМmИt (subject)"
 
-#: composer/e-msg-composer.c:414
+#: composer/e-msg-composer.c:429
 #, c-format
-msgid "Could not open signature file %s:\n%s"
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:570
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Ment mint..."
 
-#: composer/e-msg-composer.c:581
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "FАjl mentИsi hiba: %s"
 
-#: composer/e-msg-composer.c:601
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "FАjl betЖltИsi hiba: %s"
 
-#: composer/e-msg-composer.c:623
+#: composer/e-msg-composer.c:652
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "LevИl mentИse"
 
-#: composer/e-msg-composer.c:625
+#: composer/e-msg-composer.c:654
 #, fuzzy
 msgid "Save changes to message..."
 msgstr "LevИl mentИse"
 
-#: composer/e-msg-composer.c:666
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:710
-#: shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "EvolЗciС"
 
-#: composer/e-msg-composer.c:716
-msgid "This message has not been sent.\n\nDo you wish to save your changes?"
-msgstr "A levИl nem lett elkЭldve.\n\nMenteni akarod a vАltozАsaidat?"
+#: composer/e-msg-composer.c:745
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+"A levИl nem lett elkЭldve.\n"
+"\n"
+"Menteni akarod a vАltozАsaidat?"
 
-#: composer/e-msg-composer.c:738
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "FАjl megnyitАs"
 
-#: composer/e-msg-composer.c:864
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "A fАjl nem lИtezik."
 
-#: composer/e-msg-composer.c:874
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Nem sima fАjl."
 
-#: composer/e-msg-composer.c:884
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Az a fАjl lИtezik, de nem olvashatС."
 
-#: composer/e-msg-composer.c:894
+#: composer/e-msg-composer.c:923
 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:916
-msgid "The file is very large (more than 100K).\nAre you sure you wish to insert it?"
-msgstr "A fАjl tЗl nagy (100K fЖlЖtti).\nTИnyleg be szeretnИd szЗrni?"
+#: composer/e-msg-composer.c:945
+msgid ""
+"The file is very large (more than 100K).\n"
+"Are you sure you wish to insert it?"
+msgstr ""
+"A fАjl tЗl nagy (100K fЖlЖtti).\n"
+"TИnyleg be szeretnИd szЗrni?"
 
-#: composer/e-msg-composer.c:937
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Hiba tЖrtИnt megnyitАs kЖzben."
 
-#: composer/e-msg-composer.c:1314
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "LevИl МrАsa"
 
-#: composer/e-msg-composer.c:1388
+#: composer/e-msg-composer.c:1420
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Nem tudom a dialСgust elkИszМteni."
@@ -3294,6 +3566,11 @@ msgstr "Nem tudom a dialСgust elkИszМteni."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
 
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "KeresИs"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "Иvek"
@@ -3331,17 +3608,26 @@ msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
 #: filter/filter-datespec.c:259
-msgid "The message's date will be compared against\nwhatever the time is when the filter is run\nor vfolder is opened."
+msgid ""
+"The message's date will be compared against\n"
+"whatever the time is when the filter is run\n"
+"or vfolder is opened."
 msgstr ""
 
 #: filter/filter-datespec.c:282
-msgid "The message's date will be compared against\nthe time that you specify here."
+msgid ""
+"The message's date will be compared against\n"
+"the time that you specify here."
 msgstr ""
 
 #: filter/filter-datespec.c:322
-msgid "The message's date will be compared against\na time relative to when the filter is run;\n\"a week ago\", for example."
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when the filter is run;\n"
+"\"a week ago\", for example."
 msgstr ""
 
+#. keep in sync with FilterDatespec_type!
 #: filter/filter-datespec.c:357
 #, fuzzy
 msgid "the current time"
@@ -3355,6 +3641,7 @@ msgstr ""
 msgid "a time relative to the current time"
 msgstr ""
 
+#. The label
 #: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr ""
@@ -3363,9 +3650,8 @@ msgstr ""
 msgid "<click here to select a date>"
 msgstr "<kattints ide a dАtum kivАlasztАsАhoz>"
 
-#: filter/filter-editor.c:160
-#: mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "SzШrУ szabАly hozzАadАsa"
 
@@ -3373,11 +3659,20 @@ msgstr "SzШrУ szabАly hozzАadАsa"
 msgid "Edit Filter Rule"
 msgstr "SzШrУ szabАly szerkesztИse"
 
-#: filter/filter-editor.c:456
-#: filter/filter.glade.h:7
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "SzШrУk szerkesztИse"
 
+#. and now for the action area
 #: filter/filter-filter.c:401
 msgid "Then"
 msgstr "Akkor"
@@ -3391,28 +3686,36 @@ msgid "Remove action"
 msgstr ""
 
 #: filter/filter-folder.c:143
-msgid "Oops, you forgot to choose a folder.\nPlease go back and specify a valid folder to deliver mail to."
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:212
-#: filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "VАlassz mappАt"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "мrj be egy mappa URI-t"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<kattints ide a mappa kivАlasztАsАhoz>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
-msgid "Error in regular expression '%s':\n%s"
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
 msgstr ""
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Teszt"
 
@@ -3424,239 +3727,225 @@ msgstr "SzabАly neve:"
 msgid "Untitled"
 msgstr "NИvtelen"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Ha"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr ""
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr ""
 
-#: filter/filter.glade.h:8
-msgid "Incoming\nOutgoing\n"
-msgstr ""
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "SzШrУ szabАlyok"
-
-#: filter/filter.glade.h:13
-#: filter/filter.glade.h:18
-#: mail/folder-browser.c:463
-#: mail/mail-config.glade.h:12
-#: mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Szerkeszt"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "VMappАk szerkesztИse"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "SzШrУ szabАlyok"
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "KЖrvonal:"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "VirtuАlis MappАk"
 
-#: filter/filter.glade.h:20
-#: filter/filter.glade.h:23
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "VMappa forrАsok"
 
+#. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
-#: mail/message-list.c:511
-msgid "Answered"
-msgstr "MegvАlaszolt"
-
-#: filter/libfilter-i18n.h:3
 msgid "Assign Colour"
 msgstr "SzМn hozzАrendelИse"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "PontszАm hozzАrendelИse"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "MappАba mАsolАs"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "FogadАs dАtuma"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "KЭldИs dАtuma"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "TЖrЖlt"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr ""
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "KifejezИs"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "A levИl tovАbbМtАsa cМmre"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "LevИltЖrzs"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "LevИltЖrzs"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr ""
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "A levИl el lett kЭldve"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "MappАba mozgat"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "CМmzettek"
 
-#: filter/libfilter-i18n.h:20
-#: mail/message-list.c:508
-msgid "Seen"
-msgstr "NИzett"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "FeladС"
 
-#: filter/libfilter-i18n.h:22
-msgid "Set Flag"
-msgstr ""
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "_StАtusz:"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "ForrАs"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "_StАtusz:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "TИma"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "utАna"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "elУtte"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "tartalmaz"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "nem tartalmaz"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "nincs a vИgИn"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "nem lИtezik"
 
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr "nem egyezik a regex-el:"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "nem Зgy hangzik mint"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "nincs az elejИn"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "a vИgИn van"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "lИtezik"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "nagyobb mint"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "kisebb mint"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "nem egy"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "egy"
 
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr "megegyezik a regex-el:"
-
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "akkor vagy utАn volt"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "akkor vagy elУbb"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "Зgy hangzik, mint"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "Мgy kezdУdik:"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "utАn volt"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "elУtte volt"
 
@@ -3668,8 +3957,7 @@ msgstr "SzabАly hozzАadАsa"
 msgid "Edit Score Rule"
 msgstr "PontszАm szabАly szerkesztИse"
 
-#: filter/score-rule.c:192
-#: filter/score-rule.c:194
+#: filter/score-rule.c:192 filter/score-rule.c:194
 msgid "Score"
 msgstr "PontszАm"
 
@@ -3681,130 +3969,133 @@ msgstr "VMappa szabАly hozzАadАsa"
 msgid "Edit VFolder Rule"
 msgstr "VMappa szabАly szerkesztИse"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
 
-#: mail/component-factory.c:236
-#, fuzzy
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
-
-#: mail/component-factory.c:241
-#, fuzzy
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Nem tudom az EvolЗciС levelezУ komponensИt elindМtani."
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:156
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "MentИs"
 
-#: mail/folder-browser.c:169
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "A szЖvegtЖrzs vagy a tИma tartalmaz"
 
-#: mail/folder-browser.c:170
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "A szЖvegtЖrzs tartalmaz"
 
-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "TИma tartalmaz"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "A szЖvegtЖrzs nem tartalmaz"
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "A tИma nem tartalmaz"
 
-#: mail/folder-browser.c:451
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr "VMappa a tИmАra"
 
-#: mail/folder-browser.c:452
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr "VMappa a feladСra"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr "VMappa a cМmzettekre"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr "SzШrУ a tИmАra"
 
-#: mail/folder-browser.c:456
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr "SzШrУ a feladСn"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr "SzШrУ a cМmzettekre"
 
-#: mail/folder-browser.c:458
-#: mail/folder-browser.c:541
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr "SzШrУ a levelezИsi listАra"
 
-#: mail/folder-browser.c:462
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "MegnyitАs"
 
-#: mail/folder-browser.c:464
-#: mail/mail-view.c:163
+#: mail/folder-browser.c:466
+#, 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
 msgid "Print"
 msgstr "Nyomtat"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:469
 #, fuzzy
 msgid "Reply to Sender"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:467
-#: mail/mail-view.c:156
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Mindenkinek"
 
-#: mail/folder-browser.c:468
-#: mail/mail-view.c:159
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "TovАbbМt"
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "TovАbbМt"
+
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "JelЖlИs olvasottnak"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "JelЖlИs nem olvasottnak"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "MappАba mozgatАs..."
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "MappАba mАsolАs..."
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:480
 msgid "Undelete"
 msgstr "VisszaАllМt"
 
-#: mail/folder-browser.c:481
+#. { _("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
 msgid "Apply Filters"
 msgstr "SzШrУk alkalmazАsa"
 
-#: mail/folder-browser.c:483
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "A levИlbУl gyАrts szabАlyt"
 
-#: mail/folder-browser.c:543
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "SzШrУ a levelezУ listАra (%s)"
@@ -3824,27 +4115,38 @@ msgstr "A tИma %s"
 msgid "Mail from %s"
 msgstr "LevИl %s-tСl"
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "%s levelezУlista"
 
 #: mail/mail-callbacks.c:74
-msgid "You have not configured the mail client.\nYou need to do this before you can send,\nreceive or compose mail.\nWould you like to configure it now?"
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
 msgstr ""
 
 #: mail/mail-callbacks.c:114
 #, fuzzy
-msgid "You need to configure an identity\nbefore you can compose mail."
-msgstr "Egy azonosМtСt be kell АllМtanod\nmielУtt levelet kЭldessz."
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Egy azonosМtСt be kell АllМtanod\n"
+"mielУtt levelet kЭldessz."
 
 #: mail/mail-callbacks.c:128
 #, fuzzy
-msgid "You need to configure a mail transport\nbefore you can compose mail."
-msgstr "Egy azonosМtСt be kell АllМtanod\nmielУtt levelet kЭldessz."
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Egy azonosМtСt be kell АllМtanod\n"
+"mielУtt levelet kЭldessz."
 
-#: mail/mail-callbacks.c:164
-#: mail/mail-callbacks.c:176
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
 msgid "You have no mail sources configured"
 msgstr ""
 
@@ -3857,831 +4159,909 @@ msgid "You have no Outbox configured"
 msgstr "Nincs kimenУ mappАd beАllМtva"
 
 #: mail/mail-callbacks.c:246
-msgid "This message has no subject.\nReally send?"
-msgstr "Nincs tАrgya a levИlnek.\nTИnyleg elkЭldjem?"
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Nincs tАrgya a levИlnek.\n"
+"TИnyleg elkЭldjem?"
 
 #: mail/mail-callbacks.c:291
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:533
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:554
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: mail/mail-callbacks.c:650
-msgid "You may only edit messages saved\nin the Drafts folder."
+#: mail/mail-callbacks.c:665
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:779
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "FelЭlМrod a fАjlt?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#, 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
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Ment mint..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Ment mint..."
+
+#: mail/mail-callbacks.c:877
 #, fuzzy, c-format
-msgid "Error loading filter information:\n%s"
+msgid ""
+"Error loading filter information:\n"
+"%s"
 msgstr "FАjl betЖltИsi hiba: %s"
 
-#: mail/mail-callbacks.c:824
+#: mail/mail-callbacks.c:922
 #, fuzzy
 msgid "Print Message"
 msgstr "LevИl _nyomtatАsa"
 
-#: mail/mail-callbacks.c:871
+#: mail/mail-callbacks.c:969
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "LevИl _nyomtatАsa"
 
-#: mail/mail-config-gui.c:432
-msgid "Enter your name and email address to be used in outgoing mail. You may also, optionally, enter the name of your organization, and the name of a file to read your signature from."
+#.
+#. * 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
+msgid "Identity"
+msgstr "AzonosМtС"
+
+#: po/tmp/mail-config-druid.glade.h:7
+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"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "LevИl kЭldИs"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"A levelezИsi beАllМtАsod most teljes.\n"
+"Kattints a 'Befejez' gombra a mentИshez"
+
+#: mail/mail-config-gui.c:433
+msgid ""
+"Enter your name and email address to be used in outgoing mail. You may also, "
+"optionally, enter the name of your organization, and the name of a file to "
+"read your signature from."
 msgstr ""
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Teljes nИv:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Email cМm:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Szervezet:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "AlАМrАs fАjl:"
 
-#: mail/mail-config-gui.c:500
-#: mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "AlАМrАs fАjl"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Szerver:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "FelhasznАlСlnИv:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "зtvonal:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "AuthentikАciС:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "TАmogatott tМpusok detektАlАsa..."
 
-#: mail/mail-config-gui.c:967
+#: 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"
 msgstr "KilИpИs a levИlszerkesztУbУl"
 
-#: mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "BeАllМtАsok tesztelИse"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "LevИl forrАs tМpusa:"
 
-#: mail/mail-config-gui.c:1111
-#: mail/mail-config-gui.c:1159
-msgid "Select the kind of mail server you have, and enter the relevant information about it.\n\nIf the server requires authentication, you can click the \"Detect supported types...\" button after entering the other information."
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
+msgid ""
+"Select the kind of mail server you have, and enter the relevant information "
+"about it.\n"
+"\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:1130
+#: mail/mail-config-gui.c:1154
 #, fuzzy
 msgid "News source type:"
 msgstr "зj telefon tМpus"
 
-#: mail/mail-config-gui.c:1135
-msgid "Select the kind of news server you have, and enter the relevant information about it.\n\nIf the server requires authentication, you can click the \"Detect supported types...\" button after entering the other information."
+#: mail/mail-config-gui.c:1159
+msgid ""
+"Select the kind of news server you have, and enter the relevant information "
+"about it.\n"
+"\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:1154
+#: mail/mail-config-gui.c:1178
 #, fuzzy
 msgid "Mail transport type:"
 msgstr "LevИl kЭldИs"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 #, fuzzy
 msgid "Add Identity"
 msgstr "AzonosМtС"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 #, fuzzy
 msgid "Edit Identity"
 msgstr "AzonosМtС"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "ForrАs hozzАadАsa"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "ForrАs szerkesztИse"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 #, fuzzy
 msgid "Add News Server"
 msgstr "HМrcsoport-szerverek"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 #, fuzzy
 msgid "Edit News Server"
 msgstr "HМrcsoport-szerverek"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "'%s' tesztelИse"
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr ""
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:7
-#: mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "LevelezИs beАllМtАsa"
-
-#: mail/mail-config-druid.glade.h:9
-msgid "Welcome to the Evolution Mail configuration wizard!\nBy filling in some information about your email\nsettings, you can start sending and receiving email\nright away. Click Next to continue."
-msgstr "эdvЖzЖllek az EvolЗciС levelezИsi varАzslСban!\nA levelezИsi beАllМtАsaiddal kapcsolatos informАciСk\nkitЖltИsИvel leveleket tudsz majd fogadni Иs kЭldeni.\nKattints a 'KЖvetkezУ' gombra a folytatАshoz."
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "AzonosМtС"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "LevИl forrАs"
-
-#: mail/mail-config-druid.glade.h:15
-#: mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "LevИl kЭldИs"
-
-#: mail/mail-config-druid.glade.h:17
-msgid "Your email configuration is now complete.\nClick \"Finish\" to save your new settings"
-msgstr "A levelezИsi beАllМtАsod most teljes.\nKattints a 'Befejez' gombra a mentИshez"
-
-#: mail/mail-config.glade.h:7
-#: mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr "AzonosМtСk"
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "CМm"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Szervezet"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "ForrАsok"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr "AzonosМtСk"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "LevИl forrАsok"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/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
 msgid "News Servers"
 msgstr "HМrcsoport-szerverek"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "HМrcsoport forrАsok"
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "Szervezet"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "A levelet HTML formАtumban kЭldd"
 
-#: mail/mail-config.glade.h:27
-#, fuzzy
-msgid "Mark message as seen [ms]: "
-msgstr "_Minden olvasott levИl kijelЖlИse"
-
-#: mail/mail-crypto.c:136
-#, fuzzy, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr ""
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr ""
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "ForrАsok"
 
-#: mail/mail-crypto.c:344
-#: mail/mail-crypto.c:440
-#: mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr ""
 
-#: mail/mail-crypto.c:348
-#: mail/mail-crypto.c:444
-#: mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:354
-#: mail/mail-crypto.c:450
-#: mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Nincs elИrhetУ GPG/PGP program."
 
-#: mail/mail-display.c:67
-msgid "Overwrite file?"
-msgstr "FelЭlМrod a fАjlt?"
-
-#: mail/mail-display.c:71
-#, fuzzy
-msgid "A file by that name already exists.\nOverwrite it?"
-msgstr "A megadott nИven mАr lИtezik mappa"
-
-#: mail/mail-display.c:85
+#: mail/mail-display.c:90
 #, c-format
-msgid "Could not open file %s:\n%s"
+msgid ""
+"Could not open file %s:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-display.c:97
+#: mail/mail-display.c:113
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: mail/mail-display.c:193
+#: mail/mail-display.c:218
 #, fuzzy
 msgid "Save Attachment"
 msgstr "FIXME: CsatolАsok me_ntИse..."
 
-#: mail/mail-display.c:233
+#: mail/mail-display.c:258
 #, fuzzy, c-format
 msgid "Could not create temporary directory: %s"
-msgstr "Nem tudom lИtrehozni a kЖnyvtАrat\n%s\nHiba: %s"
+msgstr ""
+"Nem tudom lИtrehozni a kЖnyvtАrat\n"
+"%s\n"
+"Hiba: %s"
 
-#: mail/mail-display.c:275
+#: mail/mail-display.c:300
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Ment mint..."
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:302
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Megnyit..."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:303
+#: mail/mail-display.c:328
 #, fuzzy
 msgid "External Viewer"
 msgstr "KЭlsУ kЖnyvtАrak"
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:330
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "RejtИs"
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s csatolАs"
 
-#: mail/mail-format.c:601
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
-#: mail/mail-format.c:823
+#: mail/mail-format.c:845
 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:835
+#: mail/mail-format.c:857
 #, fuzzy
 msgid "Encrypted message not displayed"
 msgstr "HibАs Эzenet az feladС threadtУl?"
 
-#: mail/mail-format.c:841
+#: mail/mail-format.c:863
 #, fuzzy
 msgid "Encrypted message"
 msgstr "LevИl elkЭldИse"
 
-#: mail/mail-format.c:842
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr ""
 
-#: mail/mail-format.c:1444
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1460
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1494
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1499
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-local.c:194
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 #, fuzzy
 msgid "Closing current folder"
 msgstr "_Mappa beАllМtАsa"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 #, fuzzy
 msgid "Creating new folder"
 msgstr "зj mappa kИszМtИse"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 #, fuzzy
 msgid "Copying messages"
 msgstr "LevИl МrАsa"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, c-format
-msgid "Cannot save folder metainfo; you'll probably find you can't\nopen this folder anymore: %s"
+msgid ""
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
 msgstr ""
 
-#: mail/mail-local.c:370
-msgid "If you can no longer open this mailbox, then\nyou may need to repair it manually."
+#: mail/mail-local.c:372
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:659
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr ""
 
-#: mail/mail-local.c:661
+#: mail/mail-local.c:783
 #, fuzzy
 msgid "Register local folder"
 msgstr "зj mappa kИszМtИse"
 
-#: mail/mail-ops.c:69
+#: mail/mail-ops.c:79
 #, fuzzy, c-format
 msgid "Fetching email from %s"
 msgstr "Levelek letЖltИse"
 
-#: mail/mail-ops.c:71
+#: mail/mail-ops.c:81
 #, fuzzy, c-format
 msgid "Fetch email from %s"
 msgstr "Levelek letЖltИse"
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:366
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:368
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:500
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "'%s' kЭldИs alatt"
 
-#: mail/mail-ops.c:505
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:508
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "'%s' kЭldИse"
 
-#: mail/mail-ops.c:511
+#: mail/mail-ops.c:549
 #, fuzzy
 msgid "Send a message without a subject"
 msgstr "A levИl elmentИse mАsik nИven"
 
-#: mail/mail-ops.c:682
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:684
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:820
-#: mail/mail-ops.c:827
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:824
-#: mail/mail-ops.c:830
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:942
 #, fuzzy, c-format
 msgid "Expunge \"%s\""
 msgstr "_TisztМt"
 
-#: mail/mail-ops.c:963
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1006
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "LevИl(levelek) mozgatАsa mАs mappАba"
 
-#: mail/mail-ops.c:970
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "MozgatАs alatt"
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "MАsolАs alatt"
 
-#: mail/mail-ops.c:1024
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1103
+#: 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:1106
+#: 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:1137
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1331
-#: mail/subscribe-dialog.c:324
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Nincs leМrАs)"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1395
+#: 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:1498
+#: mail/mail-ops.c:1535
 #, fuzzy, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "A levИl tovАbbМtАsa"
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1542
 #, fuzzy, c-format
 msgid "Forward message \"%s\""
 msgstr "A levИl tovАbbМtАsa"
 
-#: mail/mail-ops.c:1511
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1548
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1565
-msgid "Failed to generate mime part from message while generating forwarded message."
+#: mail/mail-ops.c:1610
+msgid ""
+"Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1651
+#: mail/mail-ops.c:1665
+#, 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
 #, fuzzy, c-format
 msgid "Loading \"%s\""
 msgstr "FejlИcek"
 
-#: mail/mail-ops.c:1653
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1757
+#: mail/mail-ops.c:1855
 #, fuzzy, c-format
 msgid "Create \"%s\""
 msgstr "LИtrehozva"
 
-#: mail/mail-ops.c:1805
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:2018
 #, fuzzy
 msgid "Clearing message display"
 msgstr "IdУ mutatАsa"
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:2024
 #, fuzzy
 msgid "Clear message display"
 msgstr "MegjelenМtИs szМnei"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "%s mappa tЖltУdik"
 
-#: mail/mail-ops.c:2148
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "%s mappa betЖltИse"
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2218
+#: mail/mail-ops.c:2313
 #, fuzzy, c-format
 msgid "View messages from \"%s\""
 msgstr "LevИl meg_tekintИse"
 
-#: mail/mail-ops.c:2244
+#: 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 "LevИl mozgatАsa mАs mappАba"
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "LevИl mozgatАsa mАs mappАba"
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "LevИl mozgatАsa mАs mappАba"
+
 #: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "MИgsem"
 
-#: mail/mail-summary.c:95
-#: mail/mail-threads.c:703
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "Nem teljes Эzenet lett a csУbe Мrva!"
 
-#: mail/mail-summary.c:368
-msgid "Mailbox summary"
-msgstr " ЖsszegzИs"
-
 #: mail/mail-threads.c:301
 #, c-format
-msgid "Error while preparing to %s:\n%s"
+msgid ""
+"Error while preparing to %s:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
-msgid "Error while `%s':\n%s"
+msgid ""
+"Error while `%s':\n"
+"%s"
 msgstr ""
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 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:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "HibАs Эzenet az feladС threadtУl?"
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "A lekИrdezИst megszakМtottad."
 
-#: mail/mail-tools.c:187
+#: mail/mail-tools.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "Nem tudok GPG/PGP programot pipe-olni: %s"
 
-#: mail/mail-tools.c:237
+#. Get all uids of source
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:267
+#: mail/mail-tools.c:269
 #, c-format
-msgid "Could not read UID cache file \"%s\". You may receive duplicate messages."
+msgid ""
+"Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#: mail/mail-tools.c:288
+#. Info
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:301
+#. Append it to dest
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:330
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr ""
 
-#: mail/mail-tools.c:367
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (forwarded message)"
 
-#: mail/mail-tools.c:377
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (no subject)"
 
-#: mail/mail-tools.c:416
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "Forwarded message (no subject)"
 
-#: mail/mail-tools.c:521
+#: mail/mail-tools.c:523
 #, c-format
-msgid "Cannot open location `%s':\n%s"
+msgid ""
+"Cannot open location `%s':\n"
+"%s"
 msgstr ""
 
 #: mail/mail-vfolder.c:147
 msgid "VFolders"
 msgstr "VMappАk"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr "зj VMappa"
 
-#: mail/mail-view.c:153
+#. 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
 msgid "Reply"
 msgstr "VАlasz"
 
-#: mail/mail-view.c:153
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 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
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "VАlasz a feladСnak Иs az Жsszes cМmzettnek"
 
-#: mail/mail-view.c:159
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "A levИl tovАbbМtАsa"
 
-#: mail/mail-view.c:163
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "A levИl nyomtatАsa"
 
-#: mail/mail-view.c:165
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "A levИl tЖrlИse"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Nem nИzett"
 
-#: mail/message-list.c:2043
-msgid "Rebuilding message view"
+#: mail/message-list.c:575
+msgid "Seen"
+msgstr "NИzett"
+
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr "MegvАlaszolt"
+
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
 msgstr ""
 
-#: mail/message-list.c:2045
-msgid "Rebuild message view"
+#. 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
+#, c-format
+msgid "%s, et al."
 msgstr ""
 
-#: mail/message-thread.c:583
-msgid "Threading message list"
-msgstr "LevИl lista rendezИse tИma szerint"
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "Ismeretlen"
 
-#: mail/message-thread.c:585
-msgid "Thread message list"
-msgstr "TИmaszerinti levИl lista"
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
+msgstr ""
+
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
+msgstr ""
 
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
@@ -4697,82 +5077,112 @@ msgstr "_IndulАshoz"
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:282
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:286
 #, c-format
-msgid "Subscribe to folder \"%s\""
+msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:387
+#: mail/subscribe-dialog.c:290
 #, c-format
-msgid "Unsubscribing to folder \"%s\""
+msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:390
+#: mail/subscribe-dialog.c:293
 #, c-format
-msgid "Unsubscribe to folder \"%s\""
+msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:110
-#: shell/e-setup.c:179
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "EvolЗciС telepМtИs"
 
-#: shell/e-setup.c:114
-msgid "This new version of Evolution needs to install additional files\ninto your personal Evolution directory"
+#: shell/e-setup.c:116
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:115
+#: shell/e-setup.c:117
 #, fuzzy
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
-msgstr "KИrlek nyomd meg az 'OK' gombot az EvolЗciС felhasznАlСi fАjljainak telepМtИsИhez"
+msgstr ""
+"KИrlek nyomd meg az 'OK' gombot az EvolЗciС felhasznАlСi fАjljainak "
+"telepМtИsИhez"
 
-#: shell/e-setup.c:156
+#: shell/e-setup.c:155
 #, fuzzy
 msgid "Could not update files correctly"
 msgstr "Nem tudom a dialСgust elkИszМteni."
 
-#: shell/e-setup.c:160
-#: shell/e-setup.c:220
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Az EvolЗciС fАjljai sikeresen telepЭltek."
 
-#: shell/e-setup.c:183
+#: shell/e-setup.c:187
 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:184
+#: shell/e-setup.c:188
 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"
+msgstr ""
+"KИrlek nyomd meg az 'OK' gombot az EvolЗciС felhasznАlСi fАjljainak "
+"telepМtИsИhez"
 
-#: shell/e-setup.c:201
+#: shell/e-setup.c:205
 #, c-format
-msgid "Cannot create the directory\n%s\nError: %s"
-msgstr "Nem tudom lИtrehozni a kЖnyvtАrat\n%s\nHiba: %s"
+msgid ""
+"Cannot create the directory\n"
+"%s\n"
+"Error: %s"
+msgstr ""
+"Nem tudom lИtrehozni a kЖnyvtАrat\n"
+"%s\n"
+"Hiba: %s"
 
-#: shell/e-setup.c:216
+#: shell/e-setup.c:220
 #, c-format
-msgid "Cannot copy files into\n`%s'."
-msgstr "Nem tudom mАsolni a fАjlokat\n'%s'-be."
+msgid ""
+"Cannot copy files into\n"
+"`%s'."
+msgstr ""
+"Nem tudom mАsolni a fАjlokat\n"
+"'%s'-be."
 
-#: shell/e-setup.c:241
+#: shell/e-setup.c:245
 #, c-format
-msgid "The file `%s' is not a directory.\nPlease move it in order to allow installation\nof the Evolution user files."
-msgstr "Az '%s' fАjl nem egy kЖnyvtАr.\nKИrlek mozgasd el a fАjlt hogy az EvolЗciС\ntelepЭlni tudjon."
+msgid ""
+"The file `%s' is not a directory.\n"
+"Please move it in order to allow installation\n"
+"of the Evolution user files."
+msgstr ""
+"Az '%s' fАjl nem egy kЖnyvtАr.\n"
+"KИrlek mozgasd el a fАjlt hogy az EvolЗciС\n"
+"telepЭlni tudjon."
 
-#: shell/e-setup.c:253
+#: shell/e-setup.c:257
 #, c-format
-msgid "The directory `%s' exists but is not the\nEvolution directory.  Please move it in order\nto allow installation of the Evolution user files."
-msgstr "Az '%s' kЖnyvtАr lИtezik.\nKИrlek tЖrЖld a fАjlt hogy az EvolЗciС\ntelepЭlni tudjon."
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+"Az '%s' kЖnyvtАr lИtezik.\n"
+"KИrlek tЖrЖld a fАjlt hogy az EvolЗciС\n"
+"telepЭlni tudjon."
 
 #: shell/e-shell-folder-creation-dialog.c:82
 #, c-format
-msgid "Cannot create the specified folder:\n%s"
-msgstr "Nem tudom elkИszМteni a megadott mappАt:\n%s"
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr ""
+"Nem tudom elkИszМteni a megadott mappАt:\n"
+"%s"
 
 #: shell/e-shell-folder-creation-dialog.c:134
 msgid "The specified folder name is not valid."
@@ -4783,59 +5193,74 @@ msgid "Evolution - Create new folder"
 msgstr "EvolЗciС - зj mappa kИszМtИse"
 
 #: shell/e-shell-folder-selection-dialog.c:96
-msgid "The type of the selected folder is not valid for\nthe requested operation."
-msgstr "A kivАlasztott mappa tМpusa nem jС a megadott\nmШvelethez."
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
+msgstr ""
+"A kivАlasztott mappa tМpusa nem jС a megadott\n"
+"mШvelethez."
 
 #: shell/e-shell-folder-selection-dialog.c:291
 msgid "New..."
 msgstr "зj..."
 
-#: shell/e-shell-folder-title-bar.c:447
-#: shell/e-shell-folder-title-bar.c:448
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
 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
 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
 msgid "Bug buddy could not be run."
 msgstr "A Bug buddy-t nem tudom futtatni."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
-msgid "Evolution is a suite of groupware applications\nfor mail, calendaring, and contact management\nwithin the GNOME desktop environment."
-msgstr "Az EvolЗciС egy munkacsoport program \nlevelezИshez, naptАr Иs cМmjegyzИk funkciСkkal\na GNOME grafikus kЖrnyezethez."
+#: shell/e-shell-view-menu.c:174
+msgid ""
+"Evolution is a suite of groupware applications\n"
+"for mail, calendaring, and contact management\n"
+"within the GNOME desktop environment."
+msgstr ""
+"Az EvolЗciС egy munkacsoport program \n"
+"levelezИshez, naptАr Иs cМmjegyzИk funkciСkkal\n"
+"a GNOME grafikus kЖrnyezethez."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "MappАba menj..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Nincs mappa mutatva)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "MappАk"
 
-#: shell/e-shell-view.c:1021
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "EvolЗciС - %s"
 
-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
 
-#: shell/e-shell.c:1157
+#: shell/e-shell.c:1208
 #, c-format
-msgid "Ooops!  The view for `%s' have died unexpectedly.  :-(\nThis probably means that the %s component has crashed."
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
 msgstr ""
 
 #: shell/e-shortcuts-view.c:122
@@ -4849,7 +5274,9 @@ msgstr "Csoport neve:"
 
 #: shell/e-shortcuts-view.c:234
 #, c-format
-msgid "Do you really want to remove group\n`%s' from the shortcut bar?"
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
 msgstr ""
 
 #: shell/e-shortcuts-view.c:239
@@ -4906,336 +5333,1368 @@ msgstr "Vedd le ezt az elemet az indМtСsАvrСl"
 msgid "Error saving shortcuts."
 msgstr "Nem sikerЭl elmenteni az elemeket."
 
-#: shell/e-storage.c:128
+#: 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
+msgid "_View"
+msgstr "_NИzet"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "A kijelЖlt mappАk megtekintИse"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(nИvtelen)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Nincs hiba"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "AlapvetУ hiba"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "A megadott nИven mАr lИtezik mappa"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "A megadott mappatМpus nem jС"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "I/O hiba"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Nincs elИg hely a mappa elkИszМtИsИhez"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "A megadott mappАt nem talАlom"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "A funkciС nincs mИg ebben a tАrolСban megМrva"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "JogosultsАgi hiba"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "A mШvelet nem tАmogatott"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "A megadott tМpus nem tАmogatott ebben a tАrolСban."
 
-#: shell/e-storage-set-view.c:235
-msgid "_View"
-msgstr "_NИzet"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "A kijelЖlt mappАk megtekintИse"
-
-#: shell/main.c:70
-msgid "Hi.  Thanks for taking the time to download this preview release\nof the Evolution groupware suite.\n\nOver the last month and a half, our focus has been on making\nEvolution usable. Many of the Evolution developers are now using\nEvolution to read their mail full time. You could too. (Just\nbe sure to keep a backup.)\n\nBut while we have fixed many bugs affecting its stability and\nsecurity, you still get the disclaimer:  Evolution will: crash,\nlose your mail when you don't want it to, refuse to delete your\nmail when you do want it to, leave stray processes running,\nconsume 100% CPU, race, lock, send HTML mail to random mailing\nlists, and embarass you in front of your friends and co-workers.\nUse only as directed.\n\nWe hope that you enjoy the results of our hard work, and we eagerly\nawait your contributions!\n"
-msgstr "HellС, kЖszЖnjЭk, hogy letЖltЖtted az Evolution csomag fejlesztУi \nverziСjАt.\n\nAz EvolЗciС csapat sokat Иs kemИnyen dolgozott hogy az EvolЗciСt \nrobusztussА, szИppИ, jСl hasznАlhatСvА, gyorssА Иs jСl tervezettИ \ntegye, ahogy csak lehetett. Nagyon fАradtak vagyunk. MИg nem vagyunk \nkИsz, mИg nem.\n\nMikor elindМtod az EvolЗciСt, kИrlek Иrtsd meg, hogy a munkАnk nagy\nrИsze a backend (hАttИr) МrАsАra irАnyult, amely az egИsz rendszert\nhajtja, Иs nem a felhasznАlСi felЭletre. Ez csak a hegycsЗcs teteje,\nИs mИg sok szeretetet fogunk beleЖlni az UI fejlesztИrИbe. Tudnod kell\nviszont, hogy amit hasznАlsz, nem demoware.\nTehАt, itt az idУ a mentegetУzИsre. Az EvolЗciС fog: crash-elni, \nelveszti a leveleid, kСsza processzeket hagy futni, megeszi a teljes\nCPU idУdet, HTML leveleket kЭld vИletlenszerШ levlistАknak, Иs lejАrat\na kollegАid Иs a barАtaid elУtt. HasznАld a sajАt felelУssИgedre.\nAzИrt remИljЭk, Иlvezni fogod a kemИny munkАnk eredmИnyИt, Иs vАrjuk\nhozzАjАrulАsod! \n"
-
-#: shell/main.c:97
-msgid "Thanks\nThe Evolution Team\n"
-msgstr "KЖszЖnettel\nAz EvolЗciС Csapat\n"
+#: shell/main.c:74
+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"
+"Evolution to read their mail full time. You could too. (Just\n"
+"be sure to keep a backup.)\n"
+"\n"
+"But while we have fixed many bugs affecting its stability and\n"
+"security, you still get the disclaimer:  Evolution will: crash,\n"
+"lose your mail when you don't want it to, refuse to delete your\n"
+"mail when you do want it to, leave stray processes running,\n"
+"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+"lists, and embarass you in front of your friends and co-workers.\n"
+"Use only as directed.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we eagerly\n"
+"await your contributions!\n"
+msgstr ""
+"HellС, kЖszЖnjЭk, hogy letЖltЖtted az Evolution csomag fejlesztУi \n"
+"verziСjАt.\n"
+"\n"
+"Az EvolЗciС csapat sokat Иs kemИnyen dolgozott hogy az EvolЗciСt \n"
+"robusztussА, szИppИ, jСl hasznАlhatСvА, gyorssА Иs jСl tervezettИ \n"
+"tegye, ahogy csak lehetett. Nagyon fАradtak vagyunk. MИg nem vagyunk \n"
+"kИsz, mИg nem.\n"
+"\n"
+"Mikor elindМtod az EvolЗciСt, kИrlek Иrtsd meg, hogy a munkАnk nagy\n"
+"rИsze a backend (hАttИr) МrАsАra irАnyult, amely az egИsz rendszert\n"
+"hajtja, Иs nem a felhasznАlСi felЭletre. Ez csak a hegycsЗcs teteje,\n"
+"Иs mИg sok szeretetet fogunk beleЖlni az UI fejlesztИrИbe. Tudnod kell\n"
+"viszont, hogy amit hasznАlsz, nem demoware.\n"
+"TehАt, itt az idУ a mentegetУzИsre. Az EvolЗciС fog: crash-elni, \n"
+"elveszti a leveleid, kСsza processzeket hagy futni, megeszi a teljes\n"
+"CPU idУdet, HTML leveleket kЭld vИletlenszerШ levlistАknak, Иs lejАrat\n"
+"a kollegАid Иs a barАtaid elУtt. HasznАld a sajАt felelУssИgedre.\n"
+"AzИrt remИljЭk, Иlvezni fogod a kemИny munkАnk eredmИnyИt, Иs vАrjuk\n"
+"hozzАjАrulАsod! \n"
+
+#: shell/main.c:101
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
+"KЖszЖnettel\n"
+"Az EvolЗciС Csapat\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Nem tudom elindМtani az EvolЗciС shell-t."
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr "TiltАs."
 
-#: shell/main.c:166
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nem tudom elindМtani a Bonobo komponens rendszert."
 
-#: ui/evolution-contact-editor.xml:7
-msgid "FIXME: _Appointment"
-msgstr "FIXME: _IdУpont"
+#.
+#. * 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"
 
-#: ui/evolution-contact-editor.xml:8
-msgid "FIXME: Meeting Re_quest"
-msgstr "FIXME: TalАlkozС _felhМvАs"
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
+#, fuzzy
+msgid "_Actions"
+msgstr "_MШveletek"
 
-#: ui/evolution-contact-editor.xml:10
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _LevИl"
+#: po/tmp/evolution-addressbook.xml.h:7
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Egy Зj nИvjegy kИszМtИse"
 
-#: ui/evolution-contact-editor.xml:11
-msgid "FIXME: _Contact"
-msgstr "FIXME: _CМmjegyzИk"
+#: po/tmp/evolution-addressbook.xml.h:9
+#, fuzzy
+msgid "Delete a contact"
+msgstr "NИvjegy tЖrlИse?"
 
-#: ui/evolution-contact-editor.xml:12
-msgid "FIXME: _Task"
-msgstr "FIXME: _Feladat"
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
+#, fuzzy
+msgid "Find"
+msgstr "FinnorszАg"
 
-#: ui/evolution-contact-editor.xml:13
-msgid "FIXME: Task _Request"
-msgstr "FIXME: Feladat f_elhМvАs"
+#: po/tmp/evolution-addressbook.xml.h:11
+msgid "Find a contact"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:14
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _NaplС bejegyzИs"
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "New"
+msgstr "зj..."
 
-#: ui/evolution-contact-editor.xml:15
-msgid "FIXME: _Note"
-msgstr "FIXME: _FeljegyzИs"
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "Stop Loading"
+msgstr "аrnyalАs"
+
+#: po/tmp/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "View All"
+msgstr "Mutasd mind"
+
+#: po/tmp/evolution-addressbook.xml.h:18
+msgid "View all contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "_NИvjegyek..."
 
-#: ui/evolution-contact-editor.xml:17
-#: ui/evolution-contact-editor.xml:122
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+msgid "_Tools"
+msgstr "_EszkЖzЖk"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-calendar.xml.h:6
+#, fuzzy
+msgid "5 Days"
+msgstr "Napok"
+
+#: po/tmp/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Alter preferences"
+msgstr "NaptАr beАllМtАsok"
+
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "NaptАr"
+
+#: po/tmp/evolution-calendar.xml.h:9
+#, fuzzy
+msgid "Calendar Preferences..."
+msgstr "NaptАr beАllМtАsok"
+
+#: po/tmp/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
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "зj mappa kИszМtИse"
+
+#: po/tmp/evolution-calendar.xml.h:12
+#, fuzzy
+msgid "Day"
+msgstr "Napok"
+
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go to"
+msgstr "DАtumra ugrАs"
+
+#: po/tmp/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "Go to a specific date"
+msgstr "DАtumra ugrАs"
+
+#: po/tmp/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Go to present time"
+msgstr "KЖvetkezУ elemre ugrАs"
+
+#: po/tmp/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
+#, fuzzy
+msgid "Next"
+msgstr "KЖ_vetkezУ"
+
+#: po/tmp/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Open a calendar"
+msgstr "NaptАr megnyitАsa"
+
+#: po/tmp/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Prev"
+msgstr "ElУnИzet:"
+
+#: po/tmp/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Print this calendar"
+msgstr "NaptАr nyomtatАsa"
+
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr ""
+
+#: po/tmp/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
+msgid "Show the working week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+msgid "Today"
+msgstr "Ma"
+
+#: po/tmp/evolution-calendar.xml.h:31
+#, fuzzy
+msgid "Week"
+msgstr "hИt"
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#, fuzzy
+msgid "_New"
+msgstr "_NИzet"
+
+#: po/tmp/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "NaptАr megnyitАsa"
+
+#: po/tmp/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "_Print this calendar"
+msgstr "NaptАr nyomtatАsa"
+
+#: po/tmp/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save Calendar As"
+msgstr "NaptАr mentИse"
+
+#: po/tmp/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
+#, fuzzy
+msgid "Delete..."
+msgstr "TЖrЖl"
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+msgid "Help"
+msgstr ""
+
+#: po/tmp/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
+#, 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
+#, 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
+#, fuzzy
+msgid "Save _As..."
+msgstr "Ment mint..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
+msgstr ""
+
+#: po/tmp/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
+msgid "See online help"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "_File"
+msgstr "_Mobil"
+
+#: po/tmp/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
+#, fuzzy
+msgid "_Save"
+msgstr "MentИs"
+
+#.
+#. * 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
+msgid "About this application"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "About..."
+msgstr "BetШtМpus..."
+
+#: po/tmp/evolution-event-editor.xml.h:8
+msgid "Actio_ns"
+msgstr "_MШveletek"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "NaptАr"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+msgid "C_ut"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Clear"
+msgstr "NaptАr"
+
+#: po/tmp/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
+#, 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
+#, fuzzy
+msgid "Copy"
+msgstr "VАllalat"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:23
+#, fuzzy
+msgid "FIXME: Address _Book..."
+msgstr "FIXME: _BetШtМpus..."
+
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr "FIXME: VАlassz f_ormАt..."
 
-#: ui/evolution-contact-editor.xml:22
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: _Memo stМlus"
+#: po/tmp/evolution-event-editor.xml.h:25
+#, fuzzy
+msgid "FIXME: Chec_k Names"
+msgstr "FIXME: _Feladat"
+
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: MappАba mАso_l..."
 
-#: ui/evolution-contact-editor.xml:24
-msgid "FIXME: Define Print _Styles..."
+#: po/tmp/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
+#, fuzzy
+msgid "FIXME: Define Print _Styles"
 msgstr "FIXME: NyomtatАsi stМlusok definiАlАsa..."
 
-#: ui/evolution-contact-editor.xml:31
+#: po/tmp/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
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: ElsУ e_lem a mappАban"
+
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
+msgstr "FIXME: _TovАbbМt"
+
+#: po/tmp/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
+#, fuzzy
+msgid "FIXME: Help"
+msgstr "FIXME: KЖvetkezУ"
+
+#: po/tmp/evolution-event-editor.xml.h:34
+#, fuzzy
+msgid "FIXME: In_complete Task"
+msgstr "FIXME: _Feladat"
+
+#: po/tmp/evolution-event-editor.xml.h:35
+#, fuzzy
+msgid "FIXME: Insert File"
+msgstr "FIXME: _Elem"
+
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr "FIXME: Elem..."
+
+#: po/tmp/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
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: NyomtatАs nИ_zet"
+
+#: po/tmp/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
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: KИrdУМv _publikАlАsa"
+
+#: po/tmp/evolution-event-editor.xml.h:41
+#, fuzzy
+msgid "FIXME: Rec_urrence..."
+msgstr "FIXME: _Objektum..."
+
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr "FIXME: _ElkЭld"
 
-#: ui/evolution-contact-editor.xml:35
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr "FIXME: CsatolАsok me_ntИse..."
 
-#: ui/evolution-contact-editor.xml:38
-msgid "FIXME: _Move to Folder..."
-msgstr "FIXME: _MappАba mozgat..."
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Szkript _hibakeresУ"
 
-#: ui/evolution-contact-editor.xml:39
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: MappАba mАso_l..."
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr "FIXME: Feladat f_elhМvАs"
 
-#: ui/evolution-contact-editor.xml:41
-msgid "Page Set_up"
-msgstr "Oldal _beАllМtАs:"
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr "FIXME: _CМmjegyzИk"
 
-#: ui/evolution-contact-editor.xml:42
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: NyomtatАs nИ_zet"
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _BeАllМt..."
 
-#: ui/evolution-contact-editor.xml:63
-msgid "FIXME: Paste _Special..."
-msgstr "FIXME: _SpeciАlis beillesztИs"
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr "FIXME: _FАjl..."
 
-#: ui/evolution-contact-editor.xml:68
-msgid "FIXME: Mark as U_nread"
-msgstr "FIXME: Ne_m olvasottnak jelЖl"
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr "FIXME: _BetШtМpus..."
 
-#: ui/evolution-contact-editor.xml:72
-msgid "_Object"
-msgstr "_Objektum"
+#: po/tmp/evolution-event-editor.xml.h:50
+#, fuzzy
+msgid "FIXME: _Formatting"
+msgstr "FIXME: __FormАzАs"
 
-#: ui/evolution-contact-editor.xml:77
-#: ui/evolution-contact-editor.xml:84
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr "FIXME: _Elem"
 
-#: ui/evolution-contact-editor.xml:78
-#: ui/evolution-contact-editor.xml:85
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Nem olvasott elem"
-
-#: ui/evolution-contact-editor.xml:79
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: ElsУ e_lem a mappАban"
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: _NaplС bejegyzИs"
 
-#: ui/evolution-contact-editor.xml:86
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr "FIXME: _UtolsС elem a mappАban"
 
-#: ui/evolution-contact-editor.xml:91
+#: po/tmp/evolution-event-editor.xml.h:54
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: _LevИl"
+
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: _Memo stМlus"
+
+#: po/tmp/evolution-event-editor.xml.h:56
+msgid "FIXME: _Move to Folder..."
+msgstr "FIXME: _MappАba mozgat..."
+
+#: po/tmp/evolution-event-editor.xml.h:57
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "FIXME: _IdУpont"
+
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr "FIXME: _FeljegyzИs"
+
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Objektum..."
+
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: B_ekezdИs..."
+
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _HelyesМrАs..."
+
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr "FIXME: а_ltalАnos"
 
-#: ui/evolution-contact-editor.xml:93
-msgid "FIXME: __Formatting"
-msgstr "FIXME: __FormАzАs"
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr "FIXME: _Feladat"
 
-#: ui/evolution-contact-editor.xml:96
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _BeАllМt..."
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: _Nem olvasott elem"
 
-#: ui/evolution-contact-editor.xml:101
+#: po/tmp/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
+msgid "F_ormat"
+msgstr "F_ormАtum"
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/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
+msgid "Go to the previous item"
+msgstr "Az elУzУ elemre ugrАs"
+
+#: po/tmp/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
+#, fuzzy
+msgid "N_ext"
+msgstr "KЖ_vetkezУ"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+#, fuzzy
+msgid "Paste"
+msgstr "Lap"
+
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "E_lУzУ"
 
-#: ui/evolution-contact-editor.xml:102
-msgid "Ne_xt"
-msgstr "KЖ_vetkezУ"
+#: po/tmp/evolution-event-editor.xml.h:78
+#, fuzzy
+msgid "Previous"
+msgstr "E_lУzУ"
 
-#: ui/evolution-contact-editor.xml:104
-msgid "_Toolbars"
-msgstr "_EszkЖzЖk"
+#: po/tmp/evolution-event-editor.xml.h:79
+msgid "Print S_etup..."
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:109
-msgid "FIXME: _File..."
-msgstr "FIXME: _FАjl..."
+#: po/tmp/evolution-event-editor.xml.h:80
+#, fuzzy
+msgid "Print Setup"
+msgstr "Oldal beАllМtАs:"
 
-#: ui/evolution-contact-editor.xml:110
-msgid "FIXME: It_em..."
-msgstr "FIXME: Elem..."
+#: po/tmp/evolution-event-editor.xml.h:83
+#, fuzzy
+msgid "Properties"
+msgstr "иbresztУ beАllМtАsok"
 
-#: ui/evolution-contact-editor.xml:111
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Objektum..."
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "RАdiС"
 
-#: ui/evolution-contact-editor.xml:116
-msgid "FIXME: _Font..."
-msgstr "FIXME: _BetШtМpus..."
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:117
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: B_ekezdИs..."
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "VАlasz"
 
-#: ui/evolution-contact-editor.xml:124
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: AktuАlis kИrdУМv _tervezИse"
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:125
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: KИrdУМv t_ervezИse"
+#: po/tmp/evolution-event-editor.xml.h:91
+msgid "Save the appointment and close the dialog box"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:127
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: KИrdУМv _publikАlАsa"
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
+#, fuzzy
+msgid "Save the current file"
+msgstr "JelenidУre ugrАs"
 
-#: ui/evolution-contact-editor.xml:128
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: KИrdУМv publikАlАsa _mint..."
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:130
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Szkript _hibakeresУ"
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:135
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _HelyesМrАs..."
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:137
-msgid "_Forms"
-msgstr "_KИrdУМvek"
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:142
-msgid "FIXME: _New Contact"
-msgstr "FIXME: з_j nИvjegy"
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:143
-msgid "FIXME: New _Contact from Same Company"
-msgstr "FIXME: зj nИvjegy ugyanannАl a _cИgnИl"
+#: po/tmp/evolution-event-editor.xml.h:99
+#, fuzzy
+msgid "Select All"
+msgstr "VАlassz mappАt"
 
-#: ui/evolution-contact-editor.xml:145
-msgid "FIXME: New _Letter to Contact"
-msgstr "FIXME: LevИl ennek a _szemИlynek"
+#: po/tmp/evolution-event-editor.xml.h:100
+#, fuzzy
+msgid "Select everything"
+msgstr "VАlassz mappАt"
 
-#: ui/evolution-contact-editor.xml:146
-msgid "FIXME: New _Message to Contact"
-msgstr "FIXME: эze_net ennek a szemИlynek"
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:147
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "FIXME: Ta_lАlkozС ezzel a szemИllyel"
+#: po/tmp/evolution-event-editor.xml.h:103
+msgid "Undo the last action"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:148
-msgid "FIXME: _Plan a Meeting..."
-msgstr "FIXME: _TalАlkozС tervezИse"
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
+#, fuzzy
+msgid "_About..."
+msgstr "BetШtМpus..."
 
-#: ui/evolution-contact-editor.xml:149
-msgid "FIXME: New _Task for Contact"
-msgstr "FIXME: зj feladat a nИvjegyhez"
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "BezАr"
 
-#: ui/evolution-contact-editor.xml:150
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "FIXME: зj naplС bejegyzИs a nИvjegyhez"
+#: po/tmp/evolution-event-editor.xml.h:106
+#, fuzzy
+msgid "_Copy"
+msgstr "_VАllalat:"
 
-#: ui/evolution-contact-editor.xml:152
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "FIXME: _ZАszlС folytatАshoz..."
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
+msgid "_Debug"
+msgstr ""
 
-#: ui/evolution-contact-editor.xml:153
-msgid "FIXME: _Display Map of Address"
-msgstr "FIXME: _TИrkИp vagy cМm megjelenМtИse"
+#: 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
+#, fuzzy
+msgid "_Edit"
+msgstr "Szerkeszt"
 
-#: ui/evolution-contact-editor.xml:154
-msgid "FIXME: _Open Web Page"
-msgstr "FIXME: _Weblap megnyitАsa"
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "KeresИs..."
 
-#: ui/evolution-contact-editor.xml:156
-msgid "FIXME: Forward as _vCard"
-msgstr "FIXME: _vCard-kИnt tovАbbkЭld"
+#: po/tmp/evolution-event-editor.xml.h:112
+msgid "_Forms"
+msgstr "_KИrdУМvek"
 
-#: ui/evolution-contact-editor.xml:157
-msgid "FIXME: For_ward"
-msgstr "FIXME: _TovАbbМt"
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+#, fuzzy
+msgid "_Help"
+msgstr "_Otthoni"
 
-#: ui/evolution-contact-editor.xml:169
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Beilleszt"
 
-#: ui/evolution-contact-editor.xml:170
-msgid "F_ormat"
-msgstr "F_ormАtum"
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr "_Objektum"
 
-#: ui/evolution-contact-editor.xml:171
-msgid "_Tools"
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "_VezetИknИv:"
+
+#: po/tmp/evolution-event-editor.xml.h:117
+#, fuzzy
+msgid "_Print"
+msgstr "Nyomtat"
+
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "иbresztУ beАllМtАsok"
+
+#: po/tmp/evolution-event-editor.xml.h:119
+#, fuzzy
+msgid "_Redo"
+msgstr "RАdiС"
+
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
 msgstr "_EszkЖzЖk"
 
-#: ui/evolution-contact-editor.xml:172
-msgid "Actio_ns"
-msgstr "_MШveletek"
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Compose"
+msgstr "BezАr"
 
-#: ui/evolution-contact-editor.xml:238
-msgid "FIXME: Previous"
-msgstr "FIXME: ElУzУ"
+#: po/tmp/evolution-mail.xml.h:7
+#, fuzzy
+msgid "Compose a new message"
+msgstr "LevИl МrАsa"
 
-#: ui/evolution-contact-editor.xml:239
-msgid "Go to the previous item"
-msgstr "Az elУzУ elemre ugrАs"
+#: po/tmp/evolution-mail.xml.h:9
+#, fuzzy
+msgid "Copy message to a new folder"
+msgstr "LevИl mozgatАsa mАs mappАba"
 
-#: ui/evolution-contact-editor.xml:241
-msgid "FIXME: Next"
-msgstr "FIXME: KЖvetkezУ"
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
+#, fuzzy
+msgid "F_older"
+msgstr "MappАk"
 
-#: ui/evolution-contact-editor.xml:242
-msgid "Go to the next item"
-msgstr "KЖvetkezУ elemre ugrАs"
+#: po/tmp/evolution-mail.xml.h:14
+#, fuzzy
+msgid "Fi_lter on Sender"
+msgstr "SzШrУ a feladСn"
+
+#: po/tmp/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Filter on Rec_ipients"
+msgstr "SzШrУ a cМmzettekre"
+
+#: po/tmp/evolution-mail.xml.h:16
+#, fuzzy
+msgid "Forget _Passwords"
+msgstr "JelszС"
+
+#: po/tmp/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Get Mail"
+msgstr "RИszletek"
+
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
+msgstr "SzШrУk szerkesztИse"
+
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "LeМrАs:"
+
+#: po/tmp/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Mar_k As Read"
+msgstr "JelЖlИs olvasottnak"
+
+#: po/tmp/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "JelЖlИs nem olvasottnak"
+
+#: po/tmp/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Move"
+msgstr "H"
+
+#: po/tmp/evolution-mail.xml.h:26
+#, 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
+msgid "Previews the message to be printed"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "NyomtatАsi elУnИzet"
+
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Print message..."
+msgstr "LevИl _nyomtatАsa"
+
+#: po/tmp/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Mindenkinek"
+
+#: po/tmp/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Reply to _Sender"
+msgstr "Mindenkinek"
+
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#, fuzzy
+msgid "Select _All"
+msgstr "VАlassz mappАt"
+
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:41
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "TИmaszerinti levИl lista"
+
+#: po/tmp/evolution-mail.xml.h:42
+#, fuzzy
+msgid "VFolder on Se_nder"
+msgstr "VMappa a feladСra"
+
+#: po/tmp/evolution-mail.xml.h:43
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "VMappa a cМmzettekre"
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
+#, fuzzy
+msgid "_Apply Filters"
+msgstr "SzШrУk alkalmazАsa"
+
+#: po/tmp/evolution-mail.xml.h:46
+#, fuzzy
+msgid "_Configure Folder"
+msgstr "_Mappa beАllМtАsa"
+
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "MappАba mАsolАs..."
+
+#: po/tmp/evolution-mail.xml.h:49
+#, fuzzy
+msgid "_Edit Message"
+msgstr "LevИl _nyomtatАsa"
+
+#: po/tmp/evolution-mail.xml.h:50
+#, fuzzy
+msgid "_Expunge"
+msgstr "_TisztМt"
+
+#: po/tmp/evolution-mail.xml.h:51
+#, fuzzy
+msgid "_Filter on Subject"
+msgstr "SzШrУ a tИmАra"
+
+#: po/tmp/evolution-mail.xml.h:52
+#, fuzzy
+msgid "_Forward"
+msgstr "TovАbbМt"
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "LevelezИs beАllМtАsa"
+
+#: po/tmp/evolution-mail.xml.h:55
+#, fuzzy
+msgid "_Message"
+msgstr "LevИltЖrzs"
+
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "MappАba mozgatАs..."
+
+#: po/tmp/evolution-mail.xml.h:57
+msgid "_Open in New Window"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Print Message"
+msgstr "LevИl _nyomtatАsa"
+
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Ment mint..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "ForrАs"
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "VisszaАllМt"
+
+#: po/tmp/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_VFolder on Subject"
+msgstr "VMappa a tИmАra"
+
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
+msgstr "VirtuАlis MappАk"
+
+#.
+#. * 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
+#, fuzzy
+msgid "Attach"
+msgstr "FАjl csatolАsa"
+
+#: po/tmp/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
+msgid "HTML"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:12
+#, 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
+msgid "Insert text file..."
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "FАjl megnyitАs"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "MentИs"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save in _folder... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "MappАba mozgatАs..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:23
+#, 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
+#, fuzzy
+msgid "Send"
+msgstr "FeladС"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "FeladС"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "FeladС"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "A levelet HTML formАtumban kЭldd"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "TИmaszerinti levИl lista"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "A levelet HTML formАtumban kЭldd"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "A levИl tЖrlИse"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "FIXME: CsatolАsok me_ntИse..."
+
+#: po/tmp/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show _attachments"
+msgstr "csatolАs"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "csatolАs"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "Megnyit..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:7
+#, fuzzy
+msgid "E_xit"
+msgstr "Szerkeszt"
+
+#: po/tmp/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution bar _shortcut"
+msgstr "EvolЗciС naptАr csatorna"
+
+#: po/tmp/evolution.xml.h:9
+msgid "Exit the program"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:10
+#, fuzzy
+msgid "Getting _Started"
+msgstr "Nem indult mИg el"
+
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:12
+msgid "Show the _Folder Bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:13
+#, fuzzy
+msgid "Show the _Shortcut Bar"
+msgstr "Nagy ikonok mutatАsa az elemeken"
+
+#: po/tmp/evolution.xml.h:14
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: po/tmp/evolution.xml.h:16
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: po/tmp/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
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:19
+#, fuzzy
+msgid "Using the _Calendar"
+msgstr "NaptАr nyomtatАsa"
+
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:21
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "EvolЗciС"
+
+#: po/tmp/evolution.xml.h:22
+#, fuzzy
+msgid "_Appointment (FIXME)"
+msgstr "MegbeszИlИsek:"
+
+#: po/tmp/evolution.xml.h:23
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "NИvjegy szerkesztУ"
+
+#: po/tmp/evolution.xml.h:26
+#, fuzzy
+msgid "_Folder"
+msgstr "MappАk"
+
+#: po/tmp/evolution.xml.h:27
+#, fuzzy
+msgid "_Go to Folder..."
+msgstr "MappАba menj..."
+
+#: po/tmp/evolution.xml.h:29
+#, fuzzy
+msgid "_Index"
+msgstr "_Beilleszt"
+
+#: po/tmp/evolution.xml.h:30
+msgid "_Mail message (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:32
+#, fuzzy
+msgid "_Settings"
+msgstr "BeАllМtАsok tesztelИse"
+
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
@@ -5313,13 +6772,8 @@ msgstr "MegbeszИlИs _vИge:"
 msgid "All Attendees"
 msgstr "Minden meghМvott"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:463
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#: widgets/misc/e-calendar-item.c:1040
-#: widgets/misc/e-calendar-item.c:2671
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -5327,32 +6781,220 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:234
-#: widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766
-#: widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:408
+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
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: widgets/misc/e-dateedit.c:237
-#: widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769
-#: widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#. 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
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "Most"
-
-#: widgets/misc/e-dateedit.c:365
-msgid "Today"
-msgstr "Ma"
-
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "CsoportosМtАs %i"
 
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "TИnyleg tЖrЖlni akarod\n"
+#~ "ezt a nИvjegyet?"
+
+#~ msgid "window2"
+#~ msgstr "2.ablak"
+
+#~ msgid "Create to-do item"
+#~ msgstr "TennivalС kИszМtИse"
+
+#~ msgid "Summary:"
+#~ msgstr "жsszegzИs:"
+
+#~ msgid "Due Date:"
+#~ msgstr "LejАrat:"
+
+#~ msgid "Priority:"
+#~ msgstr "PrioritАs:"
+
+#~ msgid "Item Comments:"
+#~ msgstr "MegjegyzИsek:"
+
+#~ msgid "Time display"
+#~ msgstr "IdУ mutatАsa"
+
+#~ msgid "Time format"
+#~ msgstr "IdУ formАtum"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 СrАs (de/du)"
+
+#~ msgid "24-hour"
+#~ msgstr "24 СrАs"
+
+#~ msgid "Weeks start on"
+#~ msgstr "A hetek kezdete"
+
+#~ msgid "Day range"
+#~ msgstr "Nap tartomАny"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "KИrlek add meg, hogy mikor kezdУdjЖn Иs mikor\n"
+#~ "fejezУdjЖn be a nap Иs a hИt.\n"
+#~ "Az ezen kМvЭlesУ idУpontok nem lesznek\n"
+#~ "megjelenМtve."
+
+#~ msgid "Day start:"
+#~ msgstr "Nap kezdete:"
+
+#~ msgid "Day end:"
+#~ msgstr "Nap vИge:"
+
+#~ msgid "Colors for display"
+#~ msgstr "MegjelenМtИs szМnei"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "TennivalС lista mutatАsa:"
+
+#~ msgid "To Do List style options:"
+#~ msgstr "TennivalС lista stМlus beАllМtАsai:"
+
+#~ msgid "Highlight overdue items"
+#~ msgstr "LejАrt elemek kivilАgМtАsa"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "VilАgМsd ki a mИg nem lejАrt elemeket"
+
+#~ msgid "Highlight items due today"
+#~ msgstr "A ma lejАrС elemek kivilАgМtАsa"
+
+#~ msgid "To Do List"
+#~ msgstr "TennivalС lista"
+
+#~ msgid "Preferences"
+#~ msgstr "BeАllМtАsok"
+
+#~ msgid "Alarms"
+#~ msgstr "иbresztУk"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "иbresztУ kiМrАsАnАl csipogj"
+
+#~ msgid "Audio alarms timeout after"
+#~ msgstr "Hang ИbreszИs idУzМtИse"
+
+#~ msgid " seconds"
+#~ msgstr " mАsodperc utАn"
+
+#~ msgid "Enable snoozing for "
+#~ msgstr "Szundi engedИse"
+
+#, fuzzy
+#~ msgid "Could not create summary"
+#~ msgstr "Nem tudom a dialСgust elkИszМteni."
+
+#, fuzzy
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Nem tudom beАllМtani a helyi tАrterЭletet -- %s"
+
+#, fuzzy
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr ""
+#~ "Nem tudom mАsolni a fАjlokat\n"
+#~ "'%s'-be."
+
+#, fuzzy
+#~ 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:"
+
+#~ msgid "matches regex"
+#~ 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."
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail configuration wizard!\n"
+#~ "By filling in some information about your email\n"
+#~ "settings, you can start sending and receiving email\n"
+#~ "right away. Click Next to continue."
+#~ msgstr ""
+#~ "эdvЖzЖllek az EvolЗciС levelezИsi varАzslСban!\n"
+#~ "A levelezИsi beАllМtАsaiddal kapcsolatos informАciСk\n"
+#~ "kitЖltИsИvel leveleket tudsz majd fogadni Иs kЭldeni.\n"
+#~ "Kattints a 'KЖvetkezУ' gombra a folytatАshoz."
+
+#, fuzzy
+#~ 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"
+
+#~ msgid "Page Set_up"
+#~ msgstr "Oldal _beАllМtАs:"
+
+#~ msgid "FIXME: Mark as U_nread"
+#~ msgstr "FIXME: Ne_m olvasottnak jelЖl"
+
+#~ msgid "FIXME: _New Contact"
+#~ msgstr "FIXME: з_j nИvjegy"
+
+#~ msgid "FIXME: New _Contact from Same Company"
+#~ msgstr "FIXME: зj nИvjegy ugyanannАl a _cИgnИl"
+
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "FIXME: LevИl ennek a _szemИlynek"
+
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "FIXME: Ta_lАlkozС ezzel a szemИllyel"
+
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "FIXME: _TalАlkozС tervezИse"
+
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "FIXME: зj feladat a nИvjegyhez"
+
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "FIXME: зj naplС bejegyzИs a nИvjegyhez"
+
+#~ msgid "FIXME: _Flag for Follow Up..."
+#~ msgstr "FIXME: _ZАszlС folytatАshoz..."
+
+#~ msgid "FIXME: _Display Map of Address"
+#~ msgstr "FIXME: _TИrkИp vagy cМm megjelenМtИse"
+
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "FIXME: _Weblap megnyitАsa"
+
+#~ msgid "FIXME: Previous"
+#~ msgstr "FIXME: ElУzУ"
diff --git a/po/it.po b/po/it.po
index 968949e287..6dd06f2d89 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 0.5\n"
-"POT-Creation-Date: 2000-12-01 13:40+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-12-02 15:44-01:00\n"
 "Last-Translator: Clara Tattoni <clara.tattoni@libero.it>\n"
 "Language-Team: Italiano <it@li.org>\n"
@@ -45,13 +45,17 @@ msgstr ""
 msgid ""
 "\n"
 "  Additional: "
-msgstr "\n Addizionale:"
+msgstr ""
+"\n"
+" Addizionale:"
 
 #: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
-msgstr "\n Famigila:"
+msgstr ""
+"\n"
+" Famigila:"
 
 #: addressbook/backend/ebook/e-card.c:3053
 msgid ""
@@ -223,25 +227,33 @@ msgstr ""
 msgid ""
 "\n"
 "  Unit:  "
-msgstr "\n UnitЮ:"
+msgstr ""
+"\n"
+" UnitЮ:"
 
 #: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
-msgstr "\n UnitЮ2:"
+msgstr ""
+"\n"
+" UnitЮ2:"
 
 #: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
-msgstr "\n UnitЮ3:"
+msgstr ""
+"\n"
+" UnitЮ3:"
 
 #: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
-msgstr "\n UnitЮ4:"
+msgstr ""
+"\n"
+" UnitЮ4:"
 
 #: addressbook/backend/ebook/e-card.c:3199
 msgid ""
@@ -289,10 +301,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:1006
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1127
-#: calendar/conduits/todo/todo-conduit.c:938 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
@@ -417,28 +429,28 @@ msgstr ""
 "la lista del Pilot dal \n"
 "demone gnome-pilot. "
 
-#: addressbook/conduit/address-conduit.c:196
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "Il cursore non puР essere caricato\n"
 
-#: addressbook/conduit/address-conduit.c:209
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EBook non caricato\n"
 
-#: addressbook/conduit/address-conduit.c:598
-#: calendar/conduits/calendar/calendar-conduit.c:710
-#: calendar/conduits/todo/todo-conduit.c:520
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Impossibile avviare il server wombat"
 
-#: addressbook/conduit/address-conduit.c:599
-#: calendar/conduits/calendar/calendar-conduit.c:711
-#: calendar/conduits/todo/todo-conduit.c:521
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Impossibile avviare wombat"
 
-#: addressbook/conduit/address-conduit.c:631
-#: addressbook/conduit/address-conduit.c:634
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "Impossibile leggere il blocco Indirizzi del Pilot"
 
@@ -459,99 +471,6 @@ msgstr "Oggetto(i) appartenente a queste categorie:"
 msgid "Available Categories:"
 msgstr "Categorie disponibili:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr "P_artecipante"
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "Ufficio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "Ufficio2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr "Fax Ufficio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr "Richiamare"
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "Auto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "Ditta"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "Casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "Casa 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr "Fax Casa"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-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
-msgid "Other"
-msgstr "Altro"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "Altro fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr "Impaginatore"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr "Principale"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "Email principale"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "Email 3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -629,6 +548,11 @@ msgstr "_Fax Ufficio"
 msgid "_Mobile"
 msgstr "C_ellulare"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Email principale"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "_Ufficio"
@@ -708,6 +632,94 @@ msgstr "No_te:"
 msgid "Details"
 msgstr "Dettagli"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "P_artecipante"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Ufficio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Ufficio2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Fax Ufficio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Richiamare"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Auto"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Ditta"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Casa"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Casa 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Fax Casa"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Altro"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Altro fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Impaginatore"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Principale"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "Email 3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -808,7 +820,7 @@ msgstr "_Cognome:"
 msgid "_Suffix:"
 msgstr "S_uffisso:"
 
-#: addressbook/gui/component/addressbook.c:266
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Come _Minicards"
 
@@ -816,16 +828,16 @@ msgstr "Come _Minicards"
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:272
+#: addressbook/gui/component/addressbook.c:269
 #: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Come _Tabella"
 
-#: addressbook/gui/component/addressbook.c:392
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubruca"
 
-#: addressbook/gui/component/addressbook.c:397
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -845,27 +857,27 @@ msgstr ""
 "Se si desidera usare LDAP, Х necessario scaricare e \n"
 "installare OpenLDAP, ricompilare e reinstallare Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 msgid "Show All"
 msgstr "Mostra Tutto"
 
-#: addressbook/gui/component/addressbook.c:509 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr "Avanzato..."
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:533
 msgid "Any field contains"
 msgstr "Qualunque campo contiene"
 
-#: addressbook/gui/component/addressbook.c:540
+#: addressbook/gui/component/addressbook.c:534
 msgid "Name contains"
 msgstr "Il nome contiene"
 
-#: addressbook/gui/component/addressbook.c:541
+#: addressbook/gui/component/addressbook.c:535
 msgid "Email contains"
 msgstr "Email contiene"
 
-#: addressbook/gui/component/addressbook.c:627
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI visualizzata dal Browser delle cartelle"
 
@@ -918,6 +930,11 @@ msgstr "Seleziona Nomi"
 msgid "Select name from List:"
 msgstr "Seleziona un nome dalla Lista:"
 
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Cerca"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1030,7 +1047,7 @@ msgstr "y"
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Salva come VCard"
@@ -1053,11 +1070,6 @@ msgstr ""
 "\n"
 "Fare doppio click qui per creare un nuovo contatto."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Cerca"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1231,14 +1243,14 @@ 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:538
-#: calendar/gui/e-week-view.c:287 calendar/gui/print.c:605
+#: 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:541
-#: calendar/gui/e-week-view.c:290 calendar/gui/print.c:604
+#: 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"
 
@@ -1251,13 +1263,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:666
-#: calendar/conduits/todo/todo-conduit.c:476
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Errore durante la comunicazione con il server del calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:765
-#: calendar/conduits/calendar/calendar-conduit.c:768
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Impossibile leggere il blocco di applicazione del Calendario"
 
@@ -1269,8 +1281,8 @@ 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:575
 #: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossibile leggere il blocco delle applicazioni da fare del Pilot "
 
@@ -1329,7 +1341,7 @@ msgstr "Salva calendario"
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr ""
 
@@ -1443,7 +1455,7 @@ msgstr "Il valore percentuale deve essere compreso tra 0 e 100, inclusi"
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioritЮ dev'essere compresa tra 1 e 9, inclusi"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "La URI che il calendario visualizzerЮ"
 
@@ -1465,7 +1477,7 @@ msgstr "Indice non disponibile."
 #.
 #: 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:9
+#: po/tmp/evolution-message-composer.xml.h:8
 #: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Chiudi"
@@ -1574,7 +1586,7 @@ msgstr "Primo giorno della settimana:"
 msgid "Fri"
 msgstr "Ven"
 
-#: calendar/gui/event-editor.c:397 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "VenerdЛ"
 
@@ -1602,7 +1614,7 @@ msgstr ""
 msgid "Mon"
 msgstr "Lun"
 
-#: calendar/gui/event-editor.c:393 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "LunedЛ"
 
@@ -1618,7 +1630,7 @@ msgstr ""
 msgid "Pick a color"
 msgstr "Prendi un colore"
 
-#: filter/libfilter-i18n.h:19 po/tmp/cal-prefs-dialog.glade.h:39
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "PrioritЮ"
 
@@ -1634,7 +1646,7 @@ msgstr "Promemoria"
 msgid "Sat"
 msgstr "Sab"
 
-#: calendar/gui/event-editor.c:398 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "Sabato"
 
@@ -1659,7 +1671,7 @@ msgstr "Inizio della giornata:"
 msgid "Sun"
 msgstr "Dom"
 
-#: calendar/gui/event-editor.c:399 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "Domenica"
 
@@ -1671,7 +1683,7 @@ msgstr "TaskPad"
 msgid "Thu"
 msgstr "Gio"
 
-#: calendar/gui/event-editor.c:396 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "GiovedЛ"
 
@@ -1691,7 +1703,7 @@ msgstr "Formato del tempo:"
 msgid "Tue"
 msgstr "Mar"
 
-#: calendar/gui/event-editor.c:394 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "MartedЛ"
 
@@ -1703,7 +1715,7 @@ msgstr "Avviso visivo"
 msgid "Wed"
 msgstr "Mer"
 
-#: calendar/gui/event-editor.c:395 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "MercoledЛ"
 
@@ -1719,29 +1731,6 @@ msgstr "minuti prima che inizino."
 msgid "seconds."
 msgstr "secondi."
 
-#: calendar/gui/dialogs/task-editor.c:656
-msgid "Edit Task"
-msgstr "Modifica Obiettivo"
-
-#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:319
-msgid "No summary"
-msgstr "Niente indice"
-
-#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:325
-#, c-format
-msgid "Appointment - %s"
-msgstr "Appuntamento - %s"
-
-#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:328
-#, c-format
-msgid "Task - %s"
-msgstr "Obiettivo - %s"
-
-#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:331
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Voce nell'agenda - %s"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1780,7 +1769,7 @@ 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:1018
+#: 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
 msgid "None"
@@ -1830,31 +1819,58 @@ msgstr "_Status:"
 msgid "task-editor-dialog"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:328
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Modifica Obiettivo"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Niente indice"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Appuntamento - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Obiettivo - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Voce nell'agenda - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Apri..."
 
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Apri ..."
 
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Segna come Completato"
 
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Segna l'obiettivo come raggiunto"
 
-#: calendar/gui/e-calendar-table.c:334 filter/libfilter-i18n.h:8
-#: mail/folder-browser.c:493 mail/mail-view.c:165
+#: 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 "Elimina"
 
-#: calendar/gui/e-calendar-table.c:335
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Elimina questo obiettivo"
 
@@ -1865,50 +1881,50 @@ 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:1196
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1210
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1223
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2931 calendar/gui/e-day-view.c:2938
-#: calendar/gui/e-day-view.c:2947 calendar/gui/e-week-view.c:3164
-#: calendar/gui/e-week-view.c:3171 calendar/gui/e-week-view.c:3180
+#: 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
 msgid "New appointment..."
 msgstr "Nuovo appuntamento..."
 
-#: calendar/gui/e-day-view.c:2935 calendar/gui/e-day-view.c:2942
-#: calendar/gui/e-week-view.c:3168 calendar/gui/e-week-view.c:3175
+#: 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
 msgid "Edit this appointment..."
 msgstr "Modifica questo appuntamento..."
 
-#: calendar/gui/e-day-view.c:2936 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
 #: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Elimina questo appuntamento"
 
-#: calendar/gui/e-day-view.c:2943 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Rendi rimandabile questo appuntamento"
 
-#: calendar/gui/e-day-view.c:2944 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Elimina questa ricorrenza"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Elimina tutte le ricorrenze"
 
@@ -1919,52 +1935,6 @@ msgstr "Elimina tutte le ricorrenze"
 msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:313
-msgid "Edit Appointment"
-msgstr "Modifica Appuntamenti"
-
-#: calendar/gui/event-editor.c:368
-msgid "on"
-msgstr "il"
-
-#: calendar/gui/event-editor.c:392 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "giorno"
-
-#: calendar/gui/event-editor.c:517
-msgid "on the"
-msgstr "il"
-
-#: calendar/gui/event-editor.c:524
-msgid "th"
-msgstr " "
-
-#: calendar/gui/event-editor.c:678
-msgid "occurrences"
-msgstr "ricorrenze"
-
-#: calendar/gui/event-editor.c:795
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Questo appuntamento contiene ricorrenze che Evolution non puР modificare."
-
-#: calendar/gui/event-editor.c:2875 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr ""
-
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -2125,6 +2095,41 @@ msgstr "Settimana(e)"
 msgid "year(s)"
 msgstr "anno(i)"
 
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Modifica Appuntamenti"
+
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "il"
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "giorno"
+
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr "il"
+
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr " "
+
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "ricorrenze"
+
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
+"Questo appuntamento contiene ricorrenze che Evolution non puР modificare."
+
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr ""
+
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "gennaio"
@@ -2572,17 +2577,17 @@ msgstr "Anno corrente (%Y)"
 msgid "Print Calendar"
 msgstr "Stampa Calendario"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:934
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:345 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "LMMGVSD"
 
-#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "DLMMGVS"
 
@@ -2712,12 +2717,12 @@ msgstr "URL '%s' necessita di un componente per l'host"
 msgid "URL '%s' needs a path component"
 msgstr "URL '%s' necessita di un componente per il percorso"
 
-#: camel/camel-service.c:486
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr "NOn c'Х l'host %s."
 
-#: camel/camel-service.c:489
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Temporaneamente incapace di cercare il nome dell'host %s."
@@ -2751,6 +2756,19 @@ 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
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Impossibile avere il ticket di Kerberos:\n"
+" %s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr ""
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2761,7 +2779,7 @@ msgstr "Risposta inaspettata dal server IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "Comando IMAP fallito: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -2784,7 +2802,7 @@ msgstr "Risposta OK inattesa dal server IMAP: %s"
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare l'indice per %s"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -2840,57 +2858,193 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Impossibile creare la directory %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "Impossibile creare l'indice"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "Formato MH di UNIX delle directory della posta (versione CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "Per archiviare la posta locale in directory di posta di tipo MH"
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "Formato dei file di posta UNIX mbox-format (versione CamelLocal)"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr "Per archiviare la posta locale in formato mbox standard"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr "File di posta UNIX qmail maildir-format (versione CamelLocal)"
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Per archiviare la posta locale nelle directory qmail maildir"
+
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Inpossibile accodare il messaggio al file mbox: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Impossibile prendere il messaggio: %s"
+msgid "Store root %s is not a regular directory"
+msgstr ""
 
-#: camel/providers/local/camel-mbox-provider.c:34
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "Formato dei file di posta UNIX mbox-format"
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:36
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr "File di posta locale: %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Impossibile rinominare la cartella %s con %s: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Impossibile cancellare l'indice della cartella `%s': %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Impossibile cancellare la cartella `%s': %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"Per leggere la posta distribuita dal sitema locale, e per archiviare la "
-"posta sul disco locale."
+"Impossibile prendere il messaggio: %s\n"
+"%s"
 
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
+msgstr "Contenuto del messaggio non valido"
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Impossibile il file %s:\n"
+"Impossibile aprire la cartella `%s':\n"
 "%s "
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mbox-store.c:108
 #: camel/providers/local/camel-mh-store.c:103
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "La cartella `%s' non esiste."
 
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Impossibile creare la cartella `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' non Х una directory maildir."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Impossibile cancellare la cartella `%s': %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "non Х una directory maildir"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, 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
+#, 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
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Impossibile prendere il messaggio: %s dalla cartella: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "La cartella appare irrimediabilmente corrotta."
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Impossibile il file %s:\n"
+"%s "
+
 #: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2901,16 +3055,12 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:126
 #: camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' non Х un file regolare."
 
 #: camel/providers/local/camel-mbox-store.c:145
 #: camel/providers/local/camel-mbox-store.c:168
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2920,175 +3070,87 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "La Cartella `%s' non Х vuota.  Non cancellata."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
+#: camel/providers/local/camel-mbox-summary.c:234
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Impossibile rinominare la cartella %s con %s: destinazione esistente"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+"Impossibile aprire la cartella: %s: indice creato a partire dalla posizione "
+"%ld: %s "
 
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Le cartelle Mbox non possono essere annidate."
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
 
-#: camel/providers/local/camel-local-store.c:200
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:341
 #, c-format
-msgid "Local mail file %s"
-msgstr "File di posta locale: %s"
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Impossibile creare indice per la cartella: %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
 #, c-format
-msgid "Could not open summary %s"
-msgstr "Impossibile aprire l'indice %s"
+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/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Impossibile creare una mbox temporanea: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
-msgstr "Indice non corrispondente, interruzione sincronizzazione"
-
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Indice non corrispondente, header di X-Evolution mancante"
+#: 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
+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/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errore di scrittura nella mbox temporanea: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Impossibile copiare i dati nel file: %s"
+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/mbox/camel-mbox-summary.c:832
 #, 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/mbox/camel-mbox-summary.c:841
 #, 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/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Impossibile rinominare la cartella: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:817
-#: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore sconosciuto: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "Impossibile caricare o creare l'indice"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
-msgstr "Impossibile accodare il messaggio alla cartella 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-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Impossibile prendere il messaggio: %s\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "Formato MH di UNIX delle directory della posta"
-
-#: camel/providers/local/camel-local-provider.c:37
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Per archiviare la posta locale in directory di posta di tipo MH"
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Impossibile aprire la cartella `%s':\n"
-"%s "
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Impossibile creare la cartella `%s':\n"
-"%s"
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:116
-#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' non Х una directory."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Impossibile cancellare la cartella `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Impossibile rinominare la cartella `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Impossibile rinominare la cartella `%s': %s esiste"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "Cartelle MH non possono essere annidate."
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Directory di posta locale %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3106,7 +3168,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:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Messaggio %s non trovato."
@@ -3148,7 +3210,9 @@ msgstr "USENET News via %s"
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
-msgstr "Con questa opzione l'autenticazione con il server NNTP avviene usando una password in testo semplice."
+msgstr ""
+"Con questa opzione l'autenticazione con il server NNTP avviene usando una "
+"password in testo semplice."
 
 #: camel/providers/nntp/camel-nntp-store.c:334
 #: camel/providers/nntp/camel-nntp-store.c:500
@@ -3254,7 +3318,7 @@ msgstr ""
 "Impossibile connettersi al server POP.\\n\n"
 "Errore nell'invio della password: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Cartella `%s' non presente."
@@ -3267,7 +3331,9 @@ msgstr "Sendmail"
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
-msgstr "Per consegnare la posta passandola al programma \"sendmail\" sul sistema locale."
+msgstr ""
+"Per consegnare la posta passandola al programma \"sendmail\" sul sistema "
+"locale."
 
 #: camel/providers/sendmail/camel-sendmail-transport.c:105
 #, c-format
@@ -3310,7 +3376,8 @@ msgstr "Posta consegnata attraverso il programma sendmail"
 
 #: camel/providers/smtp/camel-smtp-provider.c:36
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
-msgstr "Per consegnare la posta connettendosi a un mail hub remoto usanto SMTP."
+msgstr ""
+"Per consegnare la posta connettendosi a un mail hub remoto usanto SMTP."
 
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
@@ -3345,7 +3412,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:118
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "allegato"
 
@@ -3388,7 +3455,7 @@ msgid "MIME type:"
 msgstr "Tipo MIME:"
 
 #: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:622
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "Da:"
 
@@ -3400,7 +3467,7 @@ msgstr "Fare clic qui per la rubrica"
 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:295 mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "A:"
 
@@ -3408,7 +3475,7 @@ msgstr "A:"
 msgid "Enter the recipients of the message"
 msgstr "Inserire i destinatari del messaggio"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:628
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -3429,7 +3496,7 @@ 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:313 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Oggetto:"
 
@@ -3437,7 +3504,7 @@ msgstr "Oggetto:"
 msgid "Enter the subject of the mail"
 msgstr "Inserire l'oggetto dell'email"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3446,38 +3513,38 @@ msgstr ""
 "Impossibile aprire il file firma: %s\n"
 "%s "
 
-#: composer/e-msg-composer.c:595
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Salva come..."
 
-#: composer/e-msg-composer.c:606
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errore nel salvare il file: %s"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errore nel caricare il file: %s"
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Salvataggio del messaggio in corso..."
 
-#: composer/e-msg-composer.c:650
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Salva i cambiamenti al messaggio..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Errore nel salvataggio del componimento in 'Bozze': %s"
 
-#: composer/e-msg-composer.c:735 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:741
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3487,27 +3554,27 @@ msgstr ""
 "\n"
 "Salvare le modifiche?"
 
-#: composer/e-msg-composer.c:763
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Apri file"
 
-#: composer/e-msg-composer.c:889
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Il file noon esiste."
 
-#: composer/e-msg-composer.c:899
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Non Х un file regolare."
 
-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "File esistente ma illeggibile."
 
-#: composer/e-msg-composer.c:919
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "File apparentemente accessibile ma open(2) non ha funzionato."
 
-#: composer/e-msg-composer.c:941
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3515,15 +3582,15 @@ msgstr ""
 "Questo file Х molto grande (piЫ di 100K).\n"
 "Inserire ugualmente?"
 
-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Si Х verificato un errore durante le lettura del file."
 
-#: composer/e-msg-composer.c:1339
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Componi un nuovo messaggio"
 
-#: composer/e-msg-composer.c:1416
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Impossibile creare la finestra di composizione."
 
@@ -3531,7 +3598,7 @@ msgstr "Impossibile creare la finestra di composizione."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Impossibile inizializzare il composer di Evolution."
 
-#: filter/e-search-bar.c:175
+#: filter/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "_Cerca"
 
@@ -3621,8 +3688,8 @@ msgstr "Confronta con"
 msgid "<click here to select a date>"
 msgstr "<clicca qui per selezionare una data>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di Filtro"
 
@@ -3630,6 +3697,17 @@ msgstr "Aggiungi una regola di Filtro"
 msgid "Edit Filter Rule"
 msgstr "Modifica le Regole per il Filtro"
 
+#: filter/filter-editor.c:433
+#, fuzzy
+msgid "incoming"
+msgstr "In entrata:"
+
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr "In uscita:"
+
 #: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Modifica Filtri"
@@ -3655,15 +3733,15 @@ msgstr ""
 "Oops, ti sei dimenticato di scegliere una cartella.\n"
 "Tornare indietro e specificare una cartella valida per consegnarvi la posta."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Scegli Cartella"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Inserire la URI della Cartella"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<clicca qui per selezionare una cartella>"
 
@@ -3676,7 +3754,7 @@ msgstr ""
 "Errore nell'espressione regolare `%s':\n"
 "%s"
 
-#: filter/filter-message-search.c:377 filter/filter-message-search.c:445
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
 #, c-format
 msgid "Failed to perform regex search on message header: %s"
 msgstr ""
@@ -3693,31 +3771,31 @@ msgstr "Nome della Regola:"
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Se"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Esegui le azioni"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "se tutti i criteri sonon soddisfatti"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "se qualche criterio Х soddisfatto"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Aggiungi criterio"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Rimuovi criterio"
 
-#: mail/folder-browser.c:479 po/tmp/filter.glade.h:8
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
 #: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Modifica"
@@ -3747,183 +3825,169 @@ msgid "vFolder Sources"
 msgstr "Sorgenti delle cartelle virtuali"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:557
-msgid "Answered"
-msgstr "Risposto"
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Assegna Colore"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Assegna un punteggio"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Copia nella Cartella"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Data di Ricezione"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Data di spedizione"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Eliminato"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr "Bozze"
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "Espressione"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr ""
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "Inoltra all'Indirizzo"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Corpo del messaggio"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
 msgid "Message Header"
 msgstr "Header del messaggio"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Il messaggio Х stato ricevuto"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Il messaggio Х stato inviato"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Sposta nella Cartella..."
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Destinatari"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:17
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:22 mail/message-list.c:554
-msgid "Seen"
-msgstr "Visto"
-
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Mittente"
 
-#: filter/libfilter-i18n.h:24
-msgid "Set Flag"
-msgstr ""
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "_Status:"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Sorgente"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Specifica header"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "_Status:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Oggetto"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "dopo"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "prima"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "contiene"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "non contiene"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "non finisce con"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "non esiste"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "non assomiglia a"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "non comincia per"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "finisce per"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "esiste"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "Х maggiore di"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "Х minore di"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "non Х"
 
-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "Х"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "alle o dopo"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "Alle o prima"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "Assomiglia a"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "comincia per"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "era dopo"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "era prima"
 
@@ -3947,140 +4011,131 @@ msgstr "Aggiungi regola per Cartella Virtuale"
 msgid "Edit VFolder Rule"
 msgstr "Modifica le regole per VFolder"
 
-#: mail/component-factory.c:233
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Impossibile inizializzare il componente della posta di Evolution."
 
-#: mail/component-factory.c:239
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr ""
-"Impossibile inizializzare il componente dell'indice della posta di Evolution."
-
-#: mail/component-factory.c:244
-#, fuzzy
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Impossibile inizializzare  di Evolution."
-
-#: mail/component-factory.c:282
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:156 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:17
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Salva"
 
-#: mail/folder-browser.c:169
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "Corpo o oggetto contengono"
 
-#: mail/folder-browser.c:170
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Il corpo contiene"
 
-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "L'Oggetto contiene"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Il Corpo non contiene"
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "L'Oggetto non contiene"
 
-#: mail/folder-browser.c:467
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr "Cartella Virtuale per Oggetto"
 
-#: mail/folder-browser.c:468
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr "Cartella Virtuale per Mittente"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr "Cartella Virtuale per Destinatari"
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr "Filtra sull'Oggetto"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr "Filtro sul Mittente"
 
-#: mail/folder-browser.c:473
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr "Filtro sui Destinatari:"
 
-#: mail/folder-browser.c:474 mail/folder-browser.c:558
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr "Filtra sulla Mailng List"
 
-#: mail/folder-browser.c:478 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "Apri"
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:466
 msgid "Save As..."
 msgstr "Salva con nome..."
 
-#: mail/folder-browser.c:481 mail/mail-view.c:163
+#: 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
 msgid "Print"
 msgstr "Stampa"
 
-#: mail/folder-browser.c:483
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Rispondi al Mittente"
 
-#: mail/folder-browser.c:484 mail/mail-view.c:156
+#: mail/folder-browser.c:470 mail/mail-view.c:156
 #: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Rispondi a Tutti"
 
-#: mail/folder-browser.c:485 mail/mail-view.c:159
+#: mail/folder-browser.c:471 mail/mail-view.c:159
 #: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Inoltra"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:18
-msgid "Forward as Attachment"
-msgstr "Inoltra come Allegato"
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Vai avanti nel tempo"
 
-#: mail/folder-browser.c:488
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "Segna come Letto"
 
-#: mail/folder-browser.c:489
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Segna come Non Letto"
 
-#: mail/folder-browser.c:491
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "Sposta nella Cartella..."
 
-#: mail/folder-browser.c:492
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "Copia nella Cartella..."
 
-#: mail/folder-browser.c:494
+#: mail/folder-browser.c:480
 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:498
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr "Applica Filtri"
 
-#: mail/folder-browser.c:500 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Crea Regola dal Messaggio"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtra sulla Mailng List (%s)"
@@ -4100,7 +4155,7 @@ msgstr "Oggetto Х %s"
 msgid "Mail from %s"
 msgstr "Mail da %s"
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
@@ -4157,15 +4212,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "х necessario specificare dei destinatari per inviare questo messaggio."
 
-#: mail/mail-callbacks.c:542
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Sposta messaggio(i) in"
 
-#: mail/mail-callbacks.c:544
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Copia messaggio(i) in"
 
-#: mail/mail-callbacks.c:659
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4173,15 +4228,27 @@ msgstr ""
 "х possibile modificare solo i messaggi\n"
 "salvati nella cartella Bozze."
 
-#: mail/mail-callbacks.c:720
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "Sovrascrivere il file?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Esiste giЮ un file con questo nome.\n"
+"Sovrascriverlo?"
+
+#: mail/mail-callbacks.c:748
 msgid "Save Message As..."
 msgstr "Salva Messaggio con nome..."
 
-#: mail/mail-callbacks.c:722
+#: mail/mail-callbacks.c:750
 msgid "Save Messages As..."
 msgstr "Salva messaggi con nome..."
 
-#: mail/mail-callbacks.c:849
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4190,15 +4257,48 @@ msgstr ""
 "Errore nel caricare le informazioni dei filtri:\n"
 "%s"
 
-#: mail/mail-callbacks.c:894
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Stampa Messaggio"
 
-#: mail/mail-callbacks.c:941
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Stampa Messaggio non riuscita"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr "IdentitЮ"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "Configurazione della Posta"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "Sorgente della Posta"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Trasporto della Posta"
+
+#: po/tmp/mail-config-druid.glade.h:10
+#, fuzzy
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr "Benvenuto al Wizard per configurazione della Posta!\n"
+
+#: po/tmp/mail-config-druid.glade.h:14
+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"
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -4208,59 +4308,63 @@ msgstr ""
 "posta in uscita.  х possibile, eventualmente, inserire il nome\n"
 "dell'organizzazione, e il nome di un file dal quale leggere la firma."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Nome e cognome:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Indirizzo email:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organizzazione:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "File con la firma:"
 
-#: mail/mail-config-gui.c:500 po/tmp/mail-config.glade.h:19
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "File firma"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Server:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Username:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Percorso:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autenticazione:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Trova i tipi supportati..."
 
-#: mail/mail-config-gui.c:967
+#: 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 cancellare i messaggi dal server"
 
-#: mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Prova Impostazioni"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Tipo di sorgente della posta:"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4275,11 +4379,11 @@ msgstr ""
 "bottone \"Trova i tipi supportati...\" dopo aver inserito le altre\n"
 "informazioni. "
 
-#: mail/mail-config-gui.c:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "Tipo di sorgente per le News:"
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4294,103 +4398,58 @@ msgstr ""
 "bottone \"Trova i tipi supportati...\" dopo aver inserito le altre\n"
 "informazioni. "
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "Tipo di trasporto della posta:"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Aggiungi IdentitЮ"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "Modifica IdentitЮ"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Aggiungi Sorgente"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Modifica Sorgente"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Aggiungi server delle News"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Modifica il server delle News"
 
-#: mail/mail-config-gui.c:2229
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Verifica in corso \"%s\""
 
-#: mail/mail-config-gui.c:2231
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Verifica connessione a \"%s\""
 
-#: mail/mail-config-gui.c:2272
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "Connessione riuscita!"
 
-#: mail/mail-config-gui.c:2322
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Ricerca in corso delle capacitЮ di autorizzazzione di \"%s\""
 
-#: mail/mail-config-gui.c:2324
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "Ricerca autorizzazione a \"%s\""
 
-#.
-#. * 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
-msgid "Identity"
-msgstr "IdentitЮ"
-
-#: po/tmp/mail-config-druid.glade.h:7
-msgid "Mail Configuration"
-msgstr "Configurazione della Posta"
-
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "Sorgente della Posta"
-
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Trasporto della Posta"
-
-#: po/tmp/mail-config-druid.glade.h:10
-#, fuzzy
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "Benvenuto al Wizard per configurazione della Posta!\n"
-
-#: po/tmp/mail-config-druid.glade.h:11
-msgid "By filling in some information about your email\n"
-msgstr "Riempire con qualche informazione sulla tua email\n\n"
-
-#: po/tmp/mail-config-druid.glade.h:12
-msgid "settings, you can start sending and receiving email\n"
-msgstr "Impostazioni, Х possibile iniziare ad inviare e ricevere email\n"
-
-#: po/tmp/mail-config-druid.glade.h:13
-msgid "right away. Click Next to continue."
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:14
-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"
-
 #: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Indirizzo"
@@ -4427,51 +4486,24 @@ msgstr "Invia posta in formato HTML"
 msgid "Sources"
 msgstr "Sorgenti"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Impossibile ridirigere verso %s: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Impossibile eseguire %s: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Impossibile fare un fork %s: %s"
-
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Digitare la passphrase PGP/GPG."
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Non Х stata fornita alcuna password."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Impossibile ridirigere verso GPG/PGP: %s  "
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Programma GPG/PGP non disponibile."
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
-msgstr "Sovrascrivere il file?"
-
-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Esiste giЮ un file con questo nome.\n"
-"Sovrascriverlo?"
-
-#: mail/mail-display.c:86
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4480,127 +4512,127 @@ msgstr ""
 "Impossibile aprire il file %s:\n"
 "%s "
 
-#: mail/mail-display.c:98
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossibile srivere i dati: %s"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Salva Allegati"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Impossibile creare una directory temporanea: %s"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Salva su Disco..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Apri in %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "Visualizza In linea"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Visualizzatore Esterno"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "View Inline (via %s)"
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Nascondi"
 
-#: mail/mail-format.c:501
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/mail-format.c:624
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Rispondi a:"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:845
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Supporto PGP/GPG non disponibile in questa copia di Evolution."
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "Messaggi cifrati non visualizzati"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "Messaggio cifrato"
 
-#: mail/mail-format.c:865
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Cliccare l'icona per decifrare."
 
-#: mail/mail-format.c:1467
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1482
 #, 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:1483
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/mail-format.c:1517
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/mail-format.c:1522
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1692
+#: mail/mail-format.c:1695
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:194
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiamento del formato della cartella da  \"%s\" a  \"%s\" "
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambia il formato della cartella da \"%s\" a \"%s\""
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Chiusura cartella corrente"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Creazione nuova cartella"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Copia messaggi"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4609,7 +4641,7 @@ msgstr ""
 "Impossibile salvare le metainfo della cartella; probabilmente non \n"
 "sarЮ piЫ possibile riaprire questa cartella: %s"
 
-#: mail/mail-local.c:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4617,288 +4649,293 @@ msgstr ""
 "Se non si riesce piЫ ad aprire questa mailbox, puР essere necessario\n"
 "ripararla manualmente."
 
-#: mail/mail-local.c:669
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr "Registrazione cartella locale"
 
-#: mail/mail-local.c:671
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "Registra cartella locale"
 
-#: mail/mail-ops.c:78
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Scaricamento posta da %s in corso"
 
-#: mail/mail-ops.c:80
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Scarica la posta da %s"
 
-#: mail/mail-ops.c:330
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Non c'Х nuova posta su %s."
 
-#: mail/mail-ops.c:400
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtraggio della posta su richiesta"
 
-#: mail/mail-ops.c:402
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Filtra la posta su richiesta"
 
-#: mail/mail-ops.c:537
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Invio di \"%s\" in corso"
 
-#: mail/mail-ops.c:542
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "Invio di un messaggio senza oggetto"
 
-#: mail/mail-ops.c:545
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "Invia \"%s\""
 
-#: mail/mail-ops.c:548
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Invia un messaggio senza oggetto"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "Invio della coda in corso"
 
-#: mail/mail-ops.c:721
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Invia la coda"
 
-#: mail/mail-ops.c:857 mail/mail-ops.c:864
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:861 mail/mail-ops.c:867
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:939
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Eliminazione \"%s\""
 
-#: mail/mail-ops.c:941
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Elimina \"%s\""
 
-#: mail/mail-ops.c:1000
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Spostamento messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1002
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copia messaggi da \"%s\" a \"%s\" in corso"
 
-#: mail/mail-ops.c:1005
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Sposta messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1007
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copia i messaggi da \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:1038
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Spostamento in corso"
 
-#: mail/mail-ops.c:1041
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Copia in corso"
 
-#: mail/mail-ops.c:1061
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s messaggio %d di %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1140
+#: 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:1143
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Segna i messaggi nella cartella \"%s\""
 
-#: mail/mail-ops.c:1174
+#: 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:1297
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\" in corso"
 
-#: mail/mail-ops.c:1299
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Scansione delle cartelle in \"%s\""
 
-#: mail/mail-ops.c:1368 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Nessuna descrizione)"
 
-#: mail/mail-ops.c:1429
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Allega messaggi dalla cartella \"%s\""
 
-#: mail/mail-ops.c:1432
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Allega messaggi da \"%s\""
 
-#: mail/mail-ops.c:1532
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Inoltro messaggi \"%s\" in corso"
 
-#: mail/mail-ops.c:1536
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Inoltro messaggio senza oggetto in corso"
 
-#: mail/mail-ops.c:1539
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Inoltra messaggio \"%s\""
 
-#: mail/mail-ops.c:1543
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Inoltra un messaggio senza oggetto"
 
-#: mail/mail-ops.c:1590
+#: 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:1606
+#: 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:1650
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "Messaggio inoltrato:\n"
+
+#: mail/mail-ops.c:1679
 msgid "Forwarded message:\n"
 msgstr "Messaggio inoltrato:\n"
 
-#: mail/mail-ops.c:1719
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Caricamento \"%s\" in corso"
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Carica \"%s\""
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Creazione in corso \"%s\""
 
-#: mail/mail-ops.c:1826
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Crea \"%s\""
 
-#: mail/mail-ops.c:1874
+#: 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:1920
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Sincronizzazione \"%s\""
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Sincronizza \"%s\""
 
-#: mail/mail-ops.c:1986
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Visualizzazione UID \"%s\" del messaggio"
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "Pulizia del display dei messaggi"
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Visualizza UID \"%s\" del messaggio"
 
-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "Pulisci il display dei messaggi"
 
-#: mail/mail-ops.c:2108
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Apertura messaggi dalla cartella \"%s\""
 
-#: mail/mail-ops.c:2111
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Apri i messaggi di \"%s\""
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Caricamento Cartella %s"
 
-#: mail/mail-ops.c:2217
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "Carica Cartella %s"
 
-#: mail/mail-ops.c:2281
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Visulaizzazione messaggi dalla cartella \"%s\""
 
-#: mail/mail-ops.c:2284
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Visualizza messaggi di \"%s\""
 
-#: mail/mail-ops.c:2310
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:2399
+#: mail/mail-ops.c:2428
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Salvare messaggi dalla cartella \"%s\""
 
-#: mail/mail-ops.c:2402
+#: mail/mail-ops.c:2431
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Salva messaggi dalla cartella \"%s\""
 
-#: mail/mail-ops.c:2444
+#: mail/mail-ops.c:2474
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Salvare messaggio %d di %d (uid \"%s\")"
@@ -4907,7 +4944,7 @@ msgstr "Salvare messaggio %d di %d (uid \"%s\")"
 msgid "Cancel"
 msgstr "Annulla"
 
-#: mail/mail-summary.c:104 mail/mail-threads.c:728
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "E` stato scritto un messaggio incompleto nella pipe!"
 
@@ -5042,30 +5079,38 @@ msgstr "Stampa il messaggio selezionato"
 msgid "Delete this message"
 msgstr "Elimina questo messaggio"
 
-#: mail/message-list.c:551
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:825
+#: mail/message-list.c:575
+msgid "Seen"
+msgstr "Visto"
+
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr "Risposto"
+
+#: mail/message-list.c:846
 #, 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:837 mail/message-list.c:852
+#: mail/message-list.c:858 mail/message-list.c:873
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:839 mail/message-list.c:854
+#: mail/message-list.c:860 mail/message-list.c:875
 msgid "<unknown>"
 msgstr "<Sconosciuto>"
 
-#: mail/message-list.c:2137
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr ""
 
-#: mail/message-list.c:2139
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Rivisualizza il messaggio"
 
@@ -5240,25 +5285,25 @@ msgstr ""
 msgid "Go to folder..."
 msgstr "Vai alla cartella..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Nessuna cartella mostrata)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Cartelle"
 
-#: shell/e-shell-view.c:1022
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Impossibile impostare il local storage --%s"
 
-#: shell/e-shell.c:1160
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5336,65 +5381,65 @@ msgstr "Rimuovi il collegamento dalla barra dei collegamenti"
 msgid "Error saving shortcuts."
 msgstr "Errore di salvataggio dei collegamenti."
 
-#: shell/e-storage.c:128
+#: 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
+msgid "_View"
+msgstr "_Visualizza"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Mostra la cartella selezionata"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Senza nome)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Nessun errore"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Errore generico"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Esiste giЮ una cartella con questo nome"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Il tipo di cartella specificato non Х valido"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "Errore I/O"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Spazio insufficiente per creare la cartella"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Cartella non trovata"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "Funzione non implementata"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Permesso negato"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Operazione non supportata"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Tipo on supportato"
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:36
-#: shell/e-storage-set-view.c:235
-msgid "_View"
-msgstr "_Visualizza"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Mostra la cartella selezionata"
-
-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5434,7 +5479,7 @@ msgstr ""
 "Ci auguriamo che apprezziate il risultato del nostro duro lavoro,\n"
 "e aspettiamo ansiosamente i vostri contributi!\n"
 
-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5442,15 +5487,15 @@ msgstr ""
 "Grazie\n"
 "il Team di Evolution.\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Impossibile inizializzare la shell di Evolution."
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr "Disabilita."
 
-#: shell/main.c:164
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Impossibile inizializzare il sistema di componenti Bonobo."
 
@@ -5483,7 +5528,7 @@ msgstr "Trova"
 msgid "Find a contact"
 msgstr "Trova un contatto"
 
-#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:18
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Nuovo"
 
@@ -5508,18 +5553,14 @@ msgid "View all contacts"
 msgstr "Visualizza tutti i contatti"
 
 #: po/tmp/evolution-addressbook.xml.h:19
-msgid "_New Contact"
-msgstr "_Nuovo Contatto"
-
-#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Print Contacts..."
 msgstr "Stampa _Contatti..."
 
-#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr ""
 
-#: po/tmp/evolution-addressbook.xml.h:22
+#: po/tmp/evolution-addressbook.xml.h:21
 #: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "S_trumenti"
@@ -5537,49 +5578,50 @@ msgid "Alter preferences"
 msgstr "Cambia preferenze"
 
 #: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Calendario"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Preferenze del Calendario..."
 
-#: po/tmp/evolution-calendar.xml.h:9
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Crea un nuovo appuntamento"
 
-#: po/tmp/evolution-calendar.xml.h:10
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Crea un nuovo calendario"
 
-#: po/tmp/evolution-calendar.xml.h:11
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Giorno"
 
-#: po/tmp/evolution-calendar.xml.h:12
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Torna indietro nel tempo"
 
-#: po/tmp/evolution-calendar.xml.h:13
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Vai avanti nel tempo"
 
-#: po/tmp/evolution-calendar.xml.h:14
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Vai al"
 
-#: po/tmp/evolution-calendar.xml.h:15
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Vai ad una data specifica"
 
-#: po/tmp/evolution-calendar.xml.h:16
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Vai al presente"
 
-#: po/tmp/evolution-calendar.xml.h:17
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mese"
 
-#: po/tmp/evolution-calendar.xml.h:19
-msgid "New Ca_lendar"
-msgstr "Nuovo  C_alendario"
-
 #: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Successivo"
@@ -5624,27 +5666,19 @@ msgstr "Oggi"
 msgid "Week"
 msgstr "Settimana"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:33
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Nuovo"
 
 #: po/tmp/evolution-calendar.xml.h:33
-msgid "_New appointment..."
-msgstr "_Nuovo appuntamento..."
-
-#: po/tmp/evolution-calendar.xml.h:34
-msgid "_Open"
-msgstr "_Apri"
-
-#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Open Calendar"
 msgstr "_Apri calendario"
 
-#: po/tmp/evolution-calendar.xml.h:36
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Stampa questo calendario"
 
-#: po/tmp/evolution-calendar.xml.h:37
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "_Salva Calendario come"
 
@@ -5676,7 +5710,7 @@ 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:19
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Salva _come..."
 
@@ -5704,8 +5738,8 @@ 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:40
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "_File"
 
@@ -5715,7 +5749,7 @@ 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:44
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Salva"
 
@@ -5962,7 +5996,7 @@ msgid "FIXME: what goes here?"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "F_ormato"
 
@@ -6039,7 +6073,7 @@ 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:22
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Salva il file corrente"
 
@@ -6084,12 +6118,12 @@ 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:36
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "_Informazioni su"
 
 #: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "_Chiudi"
 
@@ -6098,13 +6132,13 @@ msgid "_Copy"
 msgstr "_Copia"
 
 #: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr "_Debug"
 
 #: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:39
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -6117,7 +6151,7 @@ msgid "_Forms"
 msgstr "_Schede"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Aiuto"
 
@@ -6194,12 +6228,14 @@ msgid "Get Mail"
 msgstr "Ricevi POsta"
 
 #: po/tmp/evolution-mail.xml.h:21
-msgid "Mail _Filters..."
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "_Filtri Posta..."
 
 #: po/tmp/evolution-mail.xml.h:22
-msgid "Manage Subscriptions..."
-msgstr ""
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Descrizione:"
 
 #: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
@@ -6298,8 +6334,9 @@ msgid "_Invert Selection"
 msgstr "_Inverti Selezione"
 
 #: po/tmp/evolution-mail.xml.h:54
-msgid "_Mail Configuration..."
-msgstr "_Configurazione della Posta..."
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "Configurazione della Posta"
 
 #: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
@@ -6338,7 +6375,8 @@ msgid "_VFolder on Subject"
 msgstr "_Cartella Virtuale sull'Oggetto"
 
 #: po/tmp/evolution-mail.xml.h:64
-msgid "_Virtual Folder Editor..."
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "Editor delle Cartelle _Virtuali"
 
 #.
@@ -6349,99 +6387,91 @@ msgstr "Editor delle Cartelle _Virtuali"
 msgid "Attach"
 msgstr "Allega"
 
-#: po/tmp/evolution-message-composer.xml.h:8
-msgid "Bold"
-msgstr "Grassetto"
-
-#: po/tmp/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Chiudi il file corrente"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:12
 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
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "Inserici un file di testo..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "Apri un file"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Salva con Nome"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Salva nella cartella..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:22
 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:24
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Salva il messaggio in una cartella specificata"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Invia"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "Invia piЫ _Tardi"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "Invia piЫ _tardi"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "Invia la posta in formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "Invia il messaggio piЫ tardi"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "Invia il messaggio adesso"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "Invia questo messaggio adesso"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Sets something as bold"
-msgstr "Imposta qualcosa come grassetto"
-
-#: po/tmp/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "Mostra / nascondi allegati"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "Mostra _allegati"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "Mostra allegati"
 
-#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "_Apri..."
 
@@ -6478,111 +6508,111 @@ msgstr "Annulla iscrizione"
 #. * DO NOT compile this file as part of your application.
 #.
 #: po/tmp/evolution.xml.h:6
-msgid "Create a new folder"
-msgstr "Crea una nuova cartella"
-
-#: po/tmp/evolution.xml.h:7
 msgid "Display a different folder"
 msgstr "Visualizza un'altra cartella"
 
-#: po/tmp/evolution.xml.h:8
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "E_sci"
 
-#: po/tmp/evolution.xml.h:9
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "_Barra del Collegamenti di Evolution"
 
-#: po/tmp/evolution.xml.h:10
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Esci dal Programma"
 
-#: po/tmp/evolution.xml.h:11
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Primi _Passi"
 
-#: po/tmp/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Mostra informazioni su Evolution"
 
-#: po/tmp/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Mostra la _Barra delle Cartelle"
 
-#: po/tmp/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Mostra la _Barra di Collegamento"
 
-#: po/tmp/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Inoltra un _Bug Report"
 
-#: po/tmp/evolution.xml.h:16
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
 msgstr "Inoltra un Bug Report usando Bug Buddy"
 
-#: po/tmp/evolution.xml.h:17
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Mostra/nasconde la barra delle cartelle"
 
-#: po/tmp/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Mostra/nasconde la barra dei collegamenti"
 
-#: po/tmp/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Uso del manger dei C_ontatti"
 
-#: po/tmp/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Uso del _Calendario"
 
-#: po/tmp/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Uso del programma di _Posta"
 
-#: po/tmp/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Informazioni su Evolution..."
 
-#: po/tmp/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:22
 #, fuzzy
 msgid "_Appointment (FIXME)"
 msgstr "Appuntamenti:"
 
-#: po/tmp/evolution.xml.h:24
+#: po/tmp/evolution.xml.h:23
 #, fuzzy
 msgid "_Contact (FIXME)"
 msgstr "Editor dei Contatti"
 
-#: po/tmp/evolution.xml.h:25
-msgid "_Create New Folder..."
-msgstr "_Crea Nuova Cartella..."
-
-#: po/tmp/evolution.xml.h:28
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Cartelle"
 
-#: po/tmp/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Vai alla cartella..."
 
-#: po/tmp/evolution.xml.h:31
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Indice"
 
-#: po/tmp/evolution.xml.h:32
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Invia messaggio"
 
-#: po/tmp/evolution.xml.h:34
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Impostazioni"
 
-#: po/tmp/evolution.xml.h:35
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr ""
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Tentativo"
@@ -6659,13 +6689,6 @@ msgstr "T_ermine dell' appuntamento ore:"
 msgid "All Attendees"
 msgstr "Tutti i partecipanti"
 
-#. 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:2468
-msgid "%A, %B %d, %Y"
-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
 msgid "%B %Y"
@@ -6696,173 +6719,122 @@ msgstr ""
 msgid "Group %i"
 msgstr "Gruppo %i"
 
-#: camel/providers/imap/camel-imap-auth.c:124
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Impossibile avere il ticket di Kerberos:\n"
-" %s"
+#~ msgid "Could not create summary"
+#~ msgstr "Impossibile creare l'indice"
 
-#: camel/providers/imap/camel-imap-auth.c:195
-msgid "Bad authentication response from server."
-msgstr ""
+#~ msgid "Cannot append message to mbox file: %s"
+#~ msgstr "Inpossibile accodare il messaggio al file mbox: %s"
 
-#: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "Formato MH di UNIX delle directory della posta (versione CamelLocal)"
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Impossibile prendere il messaggio: %s"
 
-#: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "Formato dei file di posta UNIX mbox-format (versione CamelLocal)"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "Formato dei file di posta UNIX mbox-format"
 
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Per archiviare la posta locale in formato mbox standard"
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Per leggere la posta distribuita dal sitema locale, e per archiviare la "
+#~ "posta sul disco locale."
 
-#: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr "File di posta UNIX qmail maildir-format (versione CamelLocal)"
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr ""
+#~ "Impossibile rinominare la cartella %s con %s: destinazione esistente"
 
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Per archiviare la posta locale nelle directory qmail maildir"
+#~ msgid "Mbox folders may not be nested."
+#~ msgstr "Le cartelle Mbox non possono essere annidate."
 
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
+#~ msgid "Could not open summary %s"
+#~ msgstr "Impossibile aprire l'indice %s"
 
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr ""
+#~ msgid "Summary mismatch, aborting sync"
+#~ msgstr "Indice non corrispondente, interruzione sincronizzazione"
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Impossibile avere la cartella %s: %s"
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Indice non corrispondente, header di X-Evolution mancante"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Impossibile copiare i dati nel file: %s"
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
+#~ msgid "Could not load or create summary"
+#~ msgstr "Impossibile caricare o creare l'indice"
 
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr ""
+#~ msgid "Cannot append message to mh folder: %s"
+#~ msgstr "Impossibile accodare il messaggio alla cartella mh: %s"
 
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Impossibile rinominare la cartella %s con %s: %s"
+#~ msgid "UNIX MH-format mail directories"
+#~ msgstr "Formato MH di UNIX delle directory della posta"
 
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Impossibile cancellare l'indice della cartella `%s': %s"
+#~ msgid "Could not rename folder `%s': %s"
+#~ msgstr "Impossibile rinominare la cartella `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:306
-#, fuzzy, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Impossibile cancellare la cartella `%s': %s"
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Impossibile rinominare la cartella `%s': %s esiste"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Impossibile accodare il messaggio alla cartella maildir: %s: %s"
+#~ msgid "MH folders may not be nested."
+#~ msgstr "Cartelle MH non possono essere annidate."
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Messaggio assente"
+#~ msgid "Local mail directory %s"
+#~ msgstr "Directory di posta locale %s"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
-msgid "Invalid message contents"
-msgstr "Contenuto del messaggio non valido"
+#~ msgid "Deleted"
+#~ msgstr "Eliminato"
 
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' non Х una directory maildir."
+#~ msgid "Draft"
+#~ msgstr "Bozze"
 
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "non Х una directory maildir"
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr ""
+#~ "Impossibile inizializzare il componente dell'indice della posta di Evolution."
 
-#: camel/providers/local/camel-mbox-folder.c:195
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Impossibile aprire la casella di posta: %s: %s\n"
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr "Impossibile inizializzare  di Evolution."
 
-#: camel/providers/local/camel-mbox-folder.c:251
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Inpossibile accodare il messaggio al file mbox: %s: %s"
+#~ msgid "Forward as Attachment"
+#~ msgstr "Inoltra come Allegato"
 
-#: camel/providers/local/camel-mbox-folder.c:327
-#: camel/providers/local/camel-mbox-folder.c:357
-#: camel/providers/local/camel-mbox-folder.c:368
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Impossibile prendere il messaggio: %s dalla cartella: %s\n"
-"  %s"
+#~ msgid "By filling in some information about your email\n"
+#~ msgstr ""
+#~ "Riempire con qualche informazione sulla tua email\n"
+#~ "\n"
 
-#: camel/providers/local/camel-mbox-folder.c:358
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "La cartella appare irrimediabilmente corrotta."
+#~ msgid "settings, you can start sending and receiving email\n"
+#~ msgstr "Impostazioni, Х possibile iniziare ad inviare e ricevere email\n"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Fallita la costruziono del messaggio: mailbox corrotta?"
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Impossibile ridirigere verso %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Impossibile aprire la cartella: %s: indice creato a partire dalla posizione %ld: %s "
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Impossibile eseguire %s: %s\n"
 
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
+#~ msgid "Cannot fork %s: %s"
+#~ msgstr "Impossibile fare un fork %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:341
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Impossibile creare indice per la cartella: %s: %s"
+#~ msgid "_New Contact"
+#~ msgstr "_Nuovo Contatto"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Impossibile aprire la cartella per la quale creare l'indice %s: %s"
+#~ msgid "New Ca_lendar"
+#~ msgstr "Nuovo  C_alendario"
 
-#: 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
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Indice e cartella non corrispondono, nemmeno dopo una sincronizzazione"
+#~ msgid "_New appointment..."
+#~ msgstr "_Nuovo appuntamento..."
 
-#: camel/providers/local/camel-mbox-summary.c:579
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Scrittura fallita su casella di posta temporanea %s: %s"
+#~ msgid "_Open"
+#~ msgstr "_Apri"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Impossibile accodare il messaggio alla cartella mh: %s: %s"
+#~ msgid "_Mail Configuration..."
+#~ msgstr "_Configurazione della Posta..."
+
+#~ msgid "Bold"
+#~ msgstr "Grassetto"
+
+#~ msgid "Sets something as bold"
+#~ msgstr "Imposta qualcosa come grassetto"
+
+#~ msgid "Create a new folder"
+#~ msgstr "Crea una nuova cartella"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "_Crea Nuova Cartella..."
diff --git a/po/ja.po b/po/ja.po
index 7db27095de..4a33180de5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS-20001211\n"
-"POT-Creation-Date: 2000-12-11 18:33+0900\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -460,99 +460,6 @@ msgstr "╔╒╔╓╔ф╔Ю╓о╓Ё╓Л╓И╓н╔╚╔ф╔╢╔Й╓кб╟╓╥╓ф╓╓╓ч╓╧:"
 msgid "Available Categories:"
 msgstr "мЬмя╓г╓╜╓К╔╚╔ф╔╢╔Й:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr "╔╒╔╥╔╧╔©╔С╔х"
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "╩е╩Ж"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "╩е╩Ж 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr "╩е╩Ж╓н FAX"
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr "╦ф╓слА╓╥"
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "╪ж"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "╡Я╪р"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "╡х"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "╡х 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr "╡х╓н FAX"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-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
-msgid "Other"
-msgstr "╓╫╓нб╬"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "╓╫╓нб╬╓н FAX"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr "╔щ╔╠╔ы╔К"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr "╔в╔И╔╓╔ч╔Й"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr "╔И╔╦╔╙"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr "╔ф╔Л╔ц╔╞╔╧"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "╪Гмв╓й E ╔А║╪╔К"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "E ╔А║╪╔К2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "E ╔А║╪╔К3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -630,6 +537,11 @@ msgstr "╩е╩Ж╓н FAX(_F)"
 msgid "_Mobile"
 msgstr "╔Б╔п╔╓╔К(_M)"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "╪Гмв╓й E ╔А║╪╔К"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "╩е╩Ж(_u)"
@@ -709,6 +621,94 @@ msgstr "╔н║╪╔х(_t):"
 msgid "Details"
 msgstr "╬э╨ы"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "╔╒╔╥╔╧╔©╔С╔х"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "╩е╩Ж"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "╩е╩Ж 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "╩е╩Ж╓н FAX"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "╦ф╓слА╓╥"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "╪ж"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "╡Я╪р"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "╡х"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "╡х 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "╡х╓н FAX"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "╓╫╓нб╬"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "╓╫╓нб╬╓н FAX"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "╔щ╔╠╔ы╔К"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "╔в╔И╔╓╔ч╔Й"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "╔И╔╦╔╙"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "╔ф╔Л╔ц╔╞╔╧"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E ╔А║╪╔К2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E ╔А║╪╔К3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -927,6 +927,11 @@ msgstr "л╬а╟╓Ра╙бР"
 msgid "Select name from List:"
 msgstr "╔Й╔╧╔х╓╚╓Ил╬а╟╓Ра╙бР:"
 
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "╦║╨В"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1062,11 +1067,6 @@ msgstr ""
 "\n"
 "╔ю╔ж╔К╔╞╔Й╔ц╔╞╓Р╓╥╓ф©╥╣╛╔Ё╔С╔©╔╞╔х╓Р╨Ню╝╓╥╓ф╡╪╓╣╓╓"
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "╦║╨В"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1240,13 +1240,13 @@ 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:539
+#: 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:542
+#: 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 "╦А╦Е"
@@ -1475,7 +1475,7 @@ msgstr "мЬмя╓г╓╜╓КмвлС╓о╓╒╓Й╓ч╓╩╓С"
 #.
 #: 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:9
+#: po/tmp/evolution-message-composer.xml.h:8
 #: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "йд╓╦╓К"
@@ -1584,7 +1584,7 @@ msgstr "╫╣╓н╓о╓╦╓А:"
 msgid "Fri"
 msgstr "╤Б"
 
-#: calendar/gui/event-editor.c:422 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "╤БмкфЭ"
 
@@ -1612,7 +1612,7 @@ msgstr "╓ч╓ю╢Э╦б╓╛мХ╓ф╓╓╓й╓╓╔╒╔╓╔ф╔Ю:"
 msgid "Mon"
 msgstr "╥Н"
 
-#: calendar/gui/event-editor.c:418 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "╥НмкфЭ"
 
@@ -1644,7 +1644,7 @@ msgstr "╨еб╔"
 msgid "Sat"
 msgstr "ез"
 
-#: calendar/gui/event-editor.c:423 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "езмкфЭ"
 
@@ -1669,7 +1669,7 @@ msgstr "Ё╚╩офЭ:"
 msgid "Sun"
 msgstr "фЭ"
 
-#: calendar/gui/event-editor.c:424 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "фЭмкфЭ"
 
@@ -1681,7 +1681,7 @@ msgstr "╨Н╤х"
 msgid "Thu"
 msgstr "лз"
 
-#: calendar/gui/event-editor.c:421 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "лзмкфЭ"
 
@@ -1701,7 +1701,7 @@ msgstr "╩Ч╢ж╓н╔у╔╘║╪╔ч╔ц╔х:"
 msgid "Tue"
 msgstr "╡п"
 
-#: calendar/gui/event-editor.c:419 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "╡пмкфЭ"
 
@@ -1713,7 +1713,7 @@ msgstr "╩КЁпе╙╓й╔╒╔И║╪╔Ю"
 msgid "Wed"
 msgstr "©Е"
 
-#: calendar/gui/event-editor.c:420 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "©ЕмкфЭ"
 
@@ -1729,29 +1729,6 @@ msgstr "й╛а╟"
 msgid "seconds."
 msgstr " иц"
 
-#: calendar/gui/dialogs/task-editor.c:656
-msgid "Edit Task"
-msgstr "╨Н╤х╓нйт╫╦"
-
-#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:321
-msgid "No summary"
-msgstr "мвлС╓й╓╥"
-
-#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:327
-#, c-format
-msgid "Appointment - %s"
-msgstr "м╫лС - %s"
-
-#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:330
-#, c-format
-msgid "Task - %s"
-msgstr "╨Н╤х - %s"
-
-#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:333
-#, c-format
-msgid "Journal entry - %s"
-msgstr "╩елУ╣╜фЧ - %s"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1840,6 +1817,33 @@ msgstr "╬У╤╥(_S):"
 msgid "task-editor-dialog"
 msgstr "╨Н╤х╔╗╔г╔ё╔©╔ю╔╓╔╒╔М╔╟"
 
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "╨Н╤х╓нйт╫╦"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "мвлС╓й╓╥"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "м╫лС - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "╨Н╤х - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "╩елУ╣╜фЧ - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
 #: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Ё╚╓╞..."
@@ -1875,50 +1879,50 @@ 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:1197
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1211
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1224
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%b/%d"
 
-#: calendar/gui/e-day-view.c:2932 calendar/gui/e-day-view.c:2939
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-week-view.c:3165
+#: 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
 msgid "New appointment..."
 msgstr "©╥╣╛м╫лС..."
 
-#: calendar/gui/e-day-view.c:2936 calendar/gui/e-day-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "╓Ё╓нм╫лС╓Рйт╫╦..."
 
-#: calendar/gui/e-day-view.c:2937 calendar/gui/e-week-view.c:3170
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
 #: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "╓Ё╓нм╫лС╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:2944 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "╓Ё╓нм╫лС╓Р╡дф╟╓к╓╧╓К"
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "╓Ё╓н╫пмХ╩Ж╓Р╨О╫Э"
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "╓╧╓ы╓ф╓н╫пмХ╩Ж╓Р╨О╫Э"
 
@@ -1929,40 +1933,6 @@ msgstr "╓╧╓ы╓ф╓н╫пмХ╩Ж╓Р╨О╫Э"
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/event-editor.c:315
-msgid "Edit Appointment"
-msgstr "м╫лС╓нйт╫╦"
-
-#: calendar/gui/event-editor.c:392
-msgid "on"
-msgstr ""
-
-#: calendar/gui/event-editor.c:417 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "фЭ"
-
-#: calendar/gui/event-editor.c:542
-msgid "on the"
-msgstr ""
-
-#: calendar/gui/event-editor.c:549
-msgid "th"
-msgstr ""
-
-#: calendar/gui/event-editor.c:703
-msgid "occurrences"
-msgstr "╫пмХ╩Ж"
-
-#: calendar/gui/event-editor.c:820
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "╓Ё╓нм╫лС╓о Evolution ╓╛йт╫╦╫пмХ╓й╓╓╨фх╞╓Р╢ч╓С╓г╓╓╓ч╓╧"
-
-#: calendar/gui/event-editor.c:2951 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%Y/%b/%d (%a)"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -2123,6 +2093,40 @@ msgstr "╫╣"
 msgid "year(s)"
 msgstr "г╞"
 
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "м╫лС╓нйт╫╦"
+
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr ""
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "фЭ"
+
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr ""
+
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr ""
+
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "╫пмХ╩Ж"
+
+#: calendar/gui/event-editor.c:839
+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
+msgid "%a %b %d %Y"
+msgstr "%Y/%b/%d (%a)"
+
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "1╥Н"
@@ -2570,7 +2574,7 @@ msgstr "╨ёг╞ (%Y)"
 msgid "Print Calendar"
 msgstr "╔╚╔Л╔С╔ю╓н╟У╨Ч"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:957
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "╟У╨Ч╔в╔Л╔с╔Е║╪"
 
@@ -2748,6 +2752,19 @@ msgstr "URL й╦╩ЗнС `%s' ╓ол╣╦З╓й╔в╔М╔х╔Ё╔К╓Р╢ч╓С╓г╓╓╓ч╓╧"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "URL `%s' ╓н╔щ║╪╔ххж╧Ф╓о©Т╩З╓г╓о╓╒╓Й╓ч╓╩╓С"
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kerberos ╔а╔╠╔ц╔х╓Р╪Хфю╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr "╔╣║╪╔п╓╚╓И╢ж╟Ц╓ц╓©г╖╬з╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2781,7 +2798,7 @@ msgstr "IMAP ╔╣║╪╔п╓╚╓Им╫╢Э╓╥╓й╓╓ OK ╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©: %s"
 msgid "Could not load summary for %s"
 msgstr "%s ╓нмвлС╓Р╔М║╪╔и╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/imap/camel-imap-folder.c:585
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH ╠ЧеЗ╓к╔А╔ц╔╩║╪╔╦кэбн╓Р╦╚иу╓╠╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
@@ -2834,55 +2851,194 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "╔г╔ё╔Л╔╞╔х╔Й %s ╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "мвлС╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "UNIX MH ╥а╪╟╓н╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й (CamelLocal ╔п║╪╔╦╔Г╔С)"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX mbox ╥а╪╟╓н╔А║╪╔К╔у╔║╔╓╔К (CamelLocal ╔п║╪╔╦╔Г╔С)"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "йщб╦╓╣╓Л╓©╔К║╪╔х %s ╓одл╬О╓н╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "╔у╔╘╔К╔ю╓Р╪Хфю╫пмХ╓ч╓╩╓С: %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr "╔М║╪╔╚╔К╔у╔╘╔К╔ю╓о╔м╔╧╔х╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr "╔М║╪╔╚╔К╔А║╪╔К╔у╔║╔╓╔К %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "╔у╔╘╔К╔ю╓Р %s ╓╚╓И %s ╓ь╔Й╔м║╪╔Ю╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-store.c:297
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "mbox ╔у╔║╔╓╔К╓к╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s"
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "╔у╔╘╔К╔ю╓╚╓И╔╣╔ч╔Й║╪╔у╔║╔╓╔К `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-store.c:306
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Хфю╫пмХ╓ч╓╩╓С: %s"
+msgid "Could not delete folder index file `%s': %s"
+msgstr ""
+"╔у╔╘╔К╔ю╓╚╓И╔╓╔С╔г╔ц╔╞╔╧╔у╔║╔╓╔К `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:34
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX mbox ╥а╪╟╓н╔А║╪╔К╔у╔║╔╓╔К"
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "maildir ╥а╪╟╓н╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:36
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: 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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
+"╔А╔ц╔╩║╪╔╦╓Р╪Хфю╫пмХ╓ч╓╩╓С: %s\n"
+"  %s"
 
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
+msgstr "╔А╔ц╔╩║╪╔╦╓нфБмф╓ол╣╦З╓г╓╧"
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"╔у╔║╔╓╔К `%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+"╔у╔╘╔К╔ю `%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mbox-store.c:108
 #: camel/providers/local/camel-mh-store.c:103
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "╔у╔╘╔К╔ю `%s' ╓об╦╨ъ╓╥╓ч╓╩╓С"
 
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"╔у╔╘╔К╔ю `%s' ╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' ╓о maildir ╥а╪╟╓н╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "╔у╔╘╔К╔ю `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "maildir ╥а╪╟╓н╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "mailbox╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, 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
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"╔А╔ц╔╩║╪╔╦ %s ╓Р╔у╔╘╔К╔ю %s ╓╚╓И╪Хфю╫пмХ╓ч╓╩╓С\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"╔у╔║╔╓╔К `%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
+"%s"
+
 #: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2893,16 +3049,12 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:126
 #: camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ╓одл╬О╓н╔у╔║╔╓╔К╓г╓о╓╒╓Й╓ч╓╩╓С"
 
 #: camel/providers/local/camel-mbox-store.c:145
 #: camel/providers/local/camel-mbox-store.c:168
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2912,175 +3064,88 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "╔у╔╘╔К╔ю `%s' ╓о╤У╓г╓о╓╒╓Й╓ч╓╩╓С. ╨О╫Э╓╥╓ч╓╩╓С"
 
-#: camel/providers/mbox/camel-mbox-store.c:222
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "╔у╔╘╔К╔ю╓Р %s ╓╚╓И %s ╓ь╔Й╔м║╪╔Ю╫пмХ╓ч╓╩╓С╓г╓╥╓©: ╟╦юХ╓╛б╦╨ъ╓╥╓ч╓╧"
-
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox ╔у╔╘╔К╔ю╓о╔м╔╧╔х╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "╔у╔╘╔К╔ю╓РЁ╚╓╠╓ч╓╩╓С╓г╓╥╓©: ╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓ол╓╢╟ю╝╓г╓╧"
 
-#: camel/providers/local/camel-local-store.c:200
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Local mail file %s"
-msgstr "╔М║╪╔╚╔К╔А║╪╔К╔у╔║╔╓╔К %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
-#, c-format
-msgid "Could not open summary %s"
-msgstr "мвлС %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, 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
+#, 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/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "╔ф╔С╔щ╔И╔Й mailbox ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
+#: 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
+#, fuzzy
+msgid "Summary and folder mismatch, even after a sync"
 msgstr "мвлС╓╛ит╟Лцв, ф╠╢Э╓╛цФцг╓╥╓ч╓╥╓©"
 
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "мвлС╓╛ит╟Лцв, X-Evolution ╔ь╔ц╔ю╓╛╦╚иу╓╚╓Й╓ч╓╩╓С"
-
 #: camel/providers/local/camel-mbox-summary.c:562
-#: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "╨Н╤х mailbox ╓ь╫Я╓╜╫п╓╥цФ╓к╔╗╔И║╪: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "╫пно╔у╔║╔╓╔К╓ь╔г║╪╔©╓Р╔Ё╔т║╪╫пмХ╓ч╓╩╓С: %s"
+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/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "╦╣╓н╔у╔╘╔К╔ю %s ╓Рйд╓╦╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:604
-#: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "╨Н╤х╔у╔╘╔К╔ю╓Рйд╓╦╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:615
-#: camel/providers/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "╔у╔╘╔К╔ю╓Р╔Й╔м║╪╔Ю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:817
-#: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "л╓цн╓н╔╗╔И║╪: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "мвлС╓Р╨Ню╝╓ч╓©╓о╔М║╪╔и╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
-msgstr "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-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"╔А╔ц╔╩║╪╔╦╓Р╪Хфю╫пмХ╓ч╓╩╓С: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "UNIX MH ╥а╪╟╓н╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й"
-
-#: camel/providers/local/camel-local-provider.c:37
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"╔у╔╘╔К╔ю `%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"╔у╔╘╔К╔ю `%s' ╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
-"%s"
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "mh ╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:116
-#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ╓о╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "╔у╔╘╔К╔ю `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "╔у╔╘╔К╔ю `%s' ╓Р╔Й╔м║╪╔Ю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "╔у╔╘╔К╔ю `%s' ╓Р╔Й╔м║╪╔Ю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s ╓об╦╨ъ╓╥╓ч╓╧"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH ╔у╔╘╔К╔ю╓о╔м╔╧╔х╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "╔М║╪╔╚╔К╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3428,7 +3493,7 @@ msgstr "Subject:"
 msgid "Enter the subject of the mail"
 msgstr "╔А║╪╔К╓ни╫бЙ╓РфЧно╓╥╓ч╓╧"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3437,38 +3502,38 @@ msgstr ""
 "╫Пл╬╔у╔║╔╓╔К %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
 "%s"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "йлл╬╓гйщб╦..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "╔у╔║╔╓╔К╓нйщб╦цФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "╔у╔║╔╓╔К╓н╔М║╪╔ицФ╓к╔╗╔И║╪: %s"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "╔А╔ц╔╩║╪╔╦╓нйя╧╧╓Рйщб╦цФ..."
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "╔А╔ц╔╩║╪╔╦╓нйя╧╧╓Рйщб╦..."
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "'аП╟фх╒' ╓ьаП╟ф╓Рйщб╦цФ╓к╔╗╔И║╪╓╛х╞ю╦╓╥╓ч╓╥╓©: %s"
 
-#: composer/e-msg-composer.c:738 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:744
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3478,27 +3543,27 @@ msgstr ""
 "\n"
 "йя╧╧╓Рйщб╦╓╥╓ч╓╧╓╚?"
 
-#: composer/e-msg-composer.c:766
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "╔у╔║╔╓╔К╓РЁ╚╓╞"
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╩╓С"
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "╓╫╓Л╓одл╬О╓н╔у╔║╔╓╔К╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "╓╫╓н╔у╔║╔╓╔К╓об╦╨ъ╓╥╓ч╓╧╓╛║╓фи╓ъ╪Х╓Й╡дг╫╓г╓о╓╒╓Й╓ч╓╩╓С"
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "╓╫╓н╔у╔║╔╓╔К╓о╔╒╔╞╔╩╔╧╡дг╫╓н╓Х╓╕╓к╦╚╓╗╓ч╓╧╓╛║╓open(2) ╓о╪╨гт╓╥╓ч╓╥╓©"
 
-#: composer/e-msg-composer.c:944
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3506,15 +3571,15 @@ msgstr ""
 "╔у╔║╔╓╔К╓о╓х╓ф╓БбГ╓╜╓╓ (100K ╟й╬Е) ╓г╓╧\n"
 "╓╫╓Л╓РачфЧ╓╧╓К╓Ё╓х╓Рк╬╓Ю╓н╓оЁн╓╚╓г╓╧╓╚?"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "╔у╔║╔╓╔Кфи╧ЧцФ╓н╢ж╓к╔╗╔И║╪╓ох╞ю╦╓╥╓ч╓╥╓©"
 
-#: composer/e-msg-composer.c:1342
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: composer/e-msg-composer.c:1419
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "╔А║╪╔К╨Ню╝╔╕╔ё╔С╔и╔╕╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
@@ -3522,7 +3587,7 @@ msgstr "╔А║╪╔К╨Ню╝╔╕╔ё╔С╔и╔╕╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 msgid "Cannot initialize Evolution's composer."
 msgstr "Evolution ╔А║╪╔К╨Ню╝╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: filter/e-search-bar.c:175
+#: filter/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "╦║╨В(_c)"
 
@@ -3655,15 +3720,15 @@ msgstr ""
 "╔у╔╘╔К╔ю╓на╙бР╓Рк╨╓Л╓ф╓╓╓ч╓╧\n"
 "лА╓ц╓ф╔А║╪╔К╓РгшаВ╓╧╓Км╜╦З╓й╔у╔╘╔К╔ю╓Р╩ьдЙ╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "╔у╔╘╔К╔ю╓Ра╙бР"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "╔у╔╘╔К╔ю URI ╓нфЧно"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<╔у╔╘╔К╔ю╓Ра╙бР╓╧╓К╓©╓А╓к╓Ё╓Ё╓Р╔╞╔Й╔ц╔╞╓╥╓ф╓╞╓ю╓╣╓╓>"
 
@@ -3931,16 +3996,16 @@ msgstr "╡╬аш╔у╔╘╔К╔ю╔К║╪╔К╓нди╡ц"
 msgid "Edit VFolder Rule"
 msgstr "╡╬аш╔у╔╘╔К╔ю╔К║╪╔К╓нйт╫╦"
 
-#: mail/component-factory.c:203
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution ╔А║╪╔К╔Ё╔С╔щ║╪╔м╔С╔х╓н╫И╢Э╡╫╓╛╫пмХ╓ч╓╩╓С"
 
-#: mail/component-factory.c:242
+#: mail/component-factory.c:266
 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:17
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "йщб╦"
 
@@ -3992,7 +4057,7 @@ msgstr "╪У©╝╪т╓н╔у╔ё╔К╔©"
 msgid "Filter on Mailing List"
 msgstr "╔А║╪╔Й╔С╔╟╔Й╔╧╔х╓н╔у╔ё╔К╔©"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "Ё╚╓╞"
 
@@ -4131,15 +4196,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:543
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟эф╟╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:545
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪╓╥╓ч╓╧: "
 
-#: mail/mail-callbacks.c:660
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4147,11 +4212,11 @@ msgstr ""
 "╔и╔И╔у╔х╔у╔╘╔К╔юфБ╓кйщб╦╓╣╓Л╓©\n"
 "╔А╔ц╔╩║╪╔╦╓ю╓╠╓Рйт╫╦╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╧"
 
-#: mail/mail-callbacks.c:694 mail/mail-display.c:72
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
 msgid "Overwrite file?"
 msgstr "╔у╔║╔╓╔К╓Р╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:698 mail/mail-display.c:76
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4159,15 +4224,15 @@ msgstr ""
 "╓╫╓нл╬а╟╓н╔у╔║╔╓╔К╓о╓╧╓г╓кб╦╨ъ╓╥╓ч╓╧\n"
 "╬Е╫Я╓╜╓╥╓ч╓╧╓╚?"
 
-#: mail/mail-callbacks.c:743
+#: mail/mail-callbacks.c:748
 msgid "Save Message As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:745
+#: mail/mail-callbacks.c:750
 msgid "Save Messages As..."
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйлл╬╓гйщб╦..."
 
-#: mail/mail-callbacks.c:872
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4176,14 +4241,46 @@ msgstr ""
 "╔у╔ё╔К╔©╬ПйС╓н╔М║╪╔ицФ╓к╔╗╔И║╪:\n"
 "%s"
 
-#: mail/mail-callbacks.c:917
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч"
 
-#: mail/mail-callbacks.c:964
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "╔А╔ц╔╩║╪╔╦╓н╟У╨Ч╓к╪╨гт╓╥╓ч╓╥╓©"
 
+#.
+#. * 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
+msgid "Identity"
+msgstr "©х╦╣"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "╔А║╪╔КюъдЙ"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "╔А║╪╔К╔╫║╪╔╧"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "╔А║╪╔К╓нгшаВ"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr "╓Х╓╕╓Ё╓╫ Evolution ╔А║╪╔КюъдЙ╔╕╔ё╔╤║╪╔и╓ь!\n"
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+"╓╒╓й╓©╓нее╩р╔А║╪╔К╓нюъдЙ╓о╢╟н╩╓╥╓ч╓╥╓©\n"
+"\"╢╟н╩\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф©╥╓╥╓╓юъдЙ╓Рйщб╦╓╥╓ф╓╞╓ю╓╣╓╓"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4331,50 +4428,6 @@ msgstr ""
 msgid "Query authorization at \"%s\""
 msgstr ""
 
-#.
-#. * 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
-msgid "Identity"
-msgstr "©х╦╣"
-
-#: po/tmp/mail-config-druid.glade.h:7
-msgid "Mail Configuration"
-msgstr "╔А║╪╔КюъдЙ"
-
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "╔А║╪╔К╔╫║╪╔╧"
-
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "╔А║╪╔К╓нгшаВ"
-
-#: po/tmp/mail-config-druid.glade.h:10
-msgid "Welcome to the Evolution Mail configuration wizard!\n"
-msgstr "╓Х╓╕╓Ё╓╫ Evolution ╔А║╪╔КюъдЙ╔╕╔ё╔╤║╪╔и╓ь!\n"
-
-#: po/tmp/mail-config-druid.glade.h:11
-msgid "By filling in some information about your email\n"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:12
-msgid "settings, you can start sending and receiving email\n"
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:13
-msgid "right away. Click Next to continue."
-msgstr ""
-
-#: po/tmp/mail-config-druid.glade.h:14
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
-"╓╒╓й╓©╓нее╩р╔А║╪╔К╓нюъдЙ╓о╢╟н╩╓╥╓ч╓╥╓©\n"
-"\"╢╟н╩\" ╓Р╔╞╔Й╔ц╔╞╓╥╓ф©╥╓╥╓╓юъдЙ╓Рйщб╦╓╥╓ф╓╞╓ю╓╣╓╓"
-
 #: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "╔╒╔и╔Л╔╧"
@@ -4411,35 +4464,20 @@ msgstr "HTML ╥а╪╟╓г╔А╔ц╔╩║╪╔╦╓РаВ©╝"
 msgid "Sources"
 msgstr "╔╫║╪╔╧"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "%s ╓ь╓н╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "%s ╓Р╪б╧т╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "%s ╓Р fork ╫пмХ╓ч╓╩╓С: %s"
-
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "╓╒╓й╓©╓н PGP/GPG ╔я╔╧╔у╔Л║╪╔╨╓РфЧно╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "дС╤║╓╣╓Л╓©╔я╔╧╔О║╪╔и╓о╓╒╓Й╓ч╓╩╓С"
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "GPG/PGP ╓ь╓н╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP ╔в╔М╔╟╔И╔Ю╓омЬмя╓г╓╜╓ч╓╩╓С"
 
@@ -4517,79 +4555,79 @@ msgstr "╟е╧Ф╡╫╓╣╓Л╓©╔А╔ц╔╩║╪╔╦"
 msgid "Click icon to decrypt."
 msgstr "╔╒╔╓╔Ё╔С╓Р╔╞╔Й╔ц╔╞╓╥╓фиЭ╧Ф╡╫╓╥╓ф╓╞╓ю╓╣╓╓"
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1478
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-format.c:1516
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1521
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1691
+#: mail/mail-format.c:1695
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "On %s, %s wrote:\n"
 
-#: mail/mail-local.c:194
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р \"%s\" ╥а╪╟╓ьйя╧╧╓╥╓ф╓╓╓ч╓╧"
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓Р \"%s\" ╥а╪╟╓ьйя╧╧╓╥╓ч╓╧"
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "╦╫╨ъ╓н╔у╔╘╔К╔ю╓Р╔╞╔М║╪╔╨цФ"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "╦е╓╓╔у╔╘╔К╔ю╓Р╔Й╔м║╪╔Ю╓╥╓ф╔╙║╪╔в╔СцФ"
 
-#: mail/mail-local.c:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "©╥╣╛╔у╔╘╔К╔ю╓Р╨Ню╝цФ"
 
-#: mail/mail-local.c:322
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╔Ё╔т║╪цФ"
 
-#: mail/mail-local.c:334
+#: mail/mail-local.c:341
 #, 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:370
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:668
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr "╔М║╪╔╚╔К╔у╔╘╔К╔ю╓Репо©цФ"
 
-#: mail/mail-local.c:670
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "╔М║╪╔╚╔К╔у╔╘╔К╔ю╓Репо©╓╥╓ч╓╧"
 
@@ -4709,165 +4747,165 @@ msgstr "╔у╔╘╔К╔ю \"%s\" ╓нцФ╓н╔А╔ц╔╩║╪╔╦╓Р╔ч║╪╔╞╓╥╓ч╓╧"
 msgid "Marking message %d of %d"
 msgstr "╔А╔ц╔╩║╪╔╦ %d / %d ╓Р╔ч║╪╔╞цФ"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓РаЖ╨╨цФ"
 
-#: mail/mail-ops.c:1300
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "\"%s\" ╓нцФ╓н╔у╔╘╔К╔ю╓РаЖ╨╨╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:1369 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(юБлю╓й╓╥)"
 
-#: mail/mail-ops.c:1430
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ре╨иуцФ"
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "\"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ре╨иу╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "╔А╔ц╔╩║╪╔╦ \"%s\" ╓Ре╬аВцФ"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓Ре╬аВцФ"
 
-#: mail/mail-ops.c:1540
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "╔А╔ц╔╩║╪╔╦ \"%s\" ╓Ре╬аВ╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:1544
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓Ре╬аВ╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:1591
+#: 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:1608
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "е╬аВ╓╣╓Л╓К╔А╔ц╔╩║╪╔╦╓Рю╦ю╝цФ╓к╔А╔ц╔╩║╪╔╦╓╚╓И MIME ╔я║╪╔х╓ню╦ю╝╓г╪╨гт╓╥╓ч╓╥╓©"
 
-#: mail/mail-ops.c:1663
+#: mail/mail-ops.c:1665
 msgid "Forwarded messages"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ"
 
-#: mail/mail-ops.c:1677
+#: mail/mail-ops.c:1679
 msgid "Forwarded message:\n"
 msgstr "╔А╔ц╔╩║╪╔╦╓Ре╬аВ:\n"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "\"%s\" ╓Р╔М║╪╔ицФ"
 
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "\"%s\" ╓Р╔М║╪╔и╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "\"%s\" ╓Р╨Ню╝цФ"
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "\"%s\" ╓Р╨Ню╝╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr "╔╥╔╖╔К╔Ё╔С╔щ║╪╔м╔С╔х╔Й╔╧╔й║╪╓ь╥К╡л╓РйС╧П╓╧╓К╢ж╓кнЦЁ╟╓╛х╞ю╦╓╥╓ч╓╥╓©"
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "\"%s\" ╓Рф╠╢ЭцФ"
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "\"%s\" ╓Рф╠╢Э╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:2013
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "╔А╔ц╔╩║╪╔╦ UID \"%s\" ╓Ри╫╪╗цФ"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "╔А╔ц╔╩║╪╔╦╔г╔ё╔╧╔в╔Л╔╓╓Р╔╞╔Й╔╒цФ"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "╔А╔ц╔╩║╪╔╦ UID \"%s\" ╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "╔А╔ц╔╩║╪╔╦╔г╔ё╔╧╔в╔Л╔╓╓Р╔╞╔Й╔╒╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓РЁ╚╓╓╓ф╓╓╓ч╓╧"
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "\"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓РЁ╚╓╜╓ч╓╧"
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "%s ╔у╔╘╔К╔ю╓Р╔М║╪╔ицФ"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "%s ╔у╔╘╔К╔ю╓Рфи╓ъ╧Ч╓ъ╓ч╓╧"
 
-#: mail/mail-ops.c:2308
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ри╫╪╗цФ"
 
-#: mail/mail-ops.c:2311
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "\"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Ри╫╪╗╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:2337
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Хфю╓╥╓ф╓╓╓ч╓╧ %d / %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2426
+#: mail/mail-ops.c:2428
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Рйщб╦цФ"
 
-#: mail/mail-ops.c:2429
+#: mail/mail-ops.c:2431
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "╔у╔╘╔К╔ю \"%s\" ╓╚╓И╔А╔ц╔╩║╪╔╦╓Рйщб╦╓╥╓ч╓╧"
 
-#: mail/mail-ops.c:2472
+#: mail/mail-ops.c:2474
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦╓╥╓ф╓╓╓ч╓╧ %d / %d (uid \"%s\")"
@@ -4876,7 +4914,7 @@ msgstr "╔А╔ц╔╩║╪╔╦╓Рйщб╦╓╥╓ф╓╓╓ч╓╧ %d / %d (uid \"%s\")"
 msgid "Cancel"
 msgstr "╔╜╔Ц╔С╔╩╔К"
 
-#: mail/mail-summary.c:104 mail/mail-threads.c:728
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "╔я╔╓╔в╬Е╓кит╢╟а╢╓й╔А╔ц╔╩║╪╔╦╓╛╫Я╓╚╓Л╓ч╓╥╓©!"
 
@@ -5011,38 +5049,38 @@ msgstr "а╙бР╓╣╓Л╓©╔А╔ц╔╩║╪╔╦╓Р╟У╨Ч╓╥╓ч╓╧"
 msgid "Delete this message"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Р╨О╫Э╓╥╓ч╓╧"
 
-#: mail/message-list.c:574
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "л╓фи"
 
-#: mail/message-list.c:577
+#: mail/message-list.c:575
 msgid "Seen"
 msgstr "╢Шфи"
 
-#: mail/message-list.c:580
+#: mail/message-list.c:578
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:848
+#: mail/message-list.c:846
 #, 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:860 mail/message-list.c:875
+#: mail/message-list.c:858 mail/message-list.c:873
 #, c-format
 msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:862 mail/message-list.c:877
+#: mail/message-list.c:860 mail/message-list.c:875
 msgid "<unknown>"
 msgstr "<л╓цн>"
 
-#: mail/message-list.c:2159
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "╔А╔ц╔╩║╪╔╦╔с╔Е║╪╓Р╨ф╧╫цшцФ"
 
-#: mail/message-list.c:2161
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "╔А╔ц╔╩║╪╔╦╔с╔Е║╪╓Р╨ф╧╫цш"
 
@@ -5314,6 +5352,16 @@ 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
+msgid "_View"
+msgstr "и╫╪╗(_V)"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "а╙бР╓╣╓Л╓©╔у╔╘╔К╔ю╓Ри╫╪╗╓╥╓ч╓╧"
+
 #: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(л╬а╟╓й╓╥)"
@@ -5362,16 +5410,6 @@ msgstr "аЮ╨Н╓о╔╣╔щ║╪╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 msgid "The specified type is not supported in this storage"
 msgstr "╩ьдЙ╓╣╓Л╓©╪Ойл╓о╓Ё╓н╣╜╡╠аУцж╓г╓о╔╣╔щ║╪╔х╓╣╓Л╓ф╓╓╓ч╓╩╓С"
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
-msgid "_View"
-msgstr "и╫╪╗(_V)"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "а╙бР╓╣╓Л╓©╔у╔╘╔К╔ю╓Ри╫╪╗╓╥╓ч╓╧"
-
 #: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -5644,7 +5682,7 @@ msgstr "╟У╨Ч..."
 
 #: po/tmp/evolution-contact-editor.xml.h:13
 #: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:19
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "йлл╬╓гйщб╦(_A)..."
 
@@ -5673,7 +5711,7 @@ msgstr "и╫бЙ╓й╓╥╓н╔А╔ц╔╩║╪╔╦╓РаВ©╝╓╥╓ч╓╧"
 
 #: po/tmp/evolution-contact-editor.xml.h:19
 #: po/tmp/evolution-event-editor.xml.h:110
-#: po/tmp/evolution-message-composer.xml.h:40
+#: po/tmp/evolution-message-composer.xml.h:38
 #: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "╔у╔║╔╓╔К(_F)"
@@ -5684,7 +5722,7 @@ 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:44
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "йщб╦(_S)"
 
@@ -5921,7 +5959,7 @@ msgid "FIXME: what goes here?"
 msgstr ""
 
 #: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "╔у╔╘║╪╔ч╔ц╔х(_o)"
 
@@ -5998,7 +6036,7 @@ 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:22
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "╦╫╨ъ╓н╔у╔║╔╓╔К╓Рйщб╦"
 
@@ -6043,12 +6081,12 @@ msgid "Undo the last action"
 msgstr "╨г╦Е╓нф╟╨Н╓Р╓Д╓Йд╬╓╧"
 
 #: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "╬ПйС(_A)..."
 
 #: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "йд╓╦╓К(_C)"
 
@@ -6057,12 +6095,12 @@ msgid "_Copy"
 msgstr "╔Ё╔т║╪(_C)"
 
 #: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr "╔г╔п╔ц╔╟(_D)"
 
 #: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-message-composer.xml.h:37
 #: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "йт╫╦(_E)"
@@ -6076,7 +6114,7 @@ msgid "_Forms"
 msgstr "╔у╔╘║╪╔Ю(_F)"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "╔ь╔К╔в(_H)"
 
@@ -6308,99 +6346,91 @@ msgstr "╡╬аш╔у╔╘╔К╔ю╔╗╔г╔ё╔©(_V)"
 msgid "Attach"
 msgstr "е╫иМ"
 
-#: po/tmp/evolution-message-composer.xml.h:8
-msgid "Bold"
-msgstr "бю╩З"
-
-#: po/tmp/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "╦╫╨ъ╓н╔у╔║╔╓╔К╓Рйд╓╦╓К"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "Insert a file as text into the message"
 msgstr "╔А╔ц╔╩║╪╔╦╓ь╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓РачфЧ"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓РачфЧ..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "╔у╔║╔╓╔К╓РЁ╚╓╞"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "йлл╬╓гйщб╦"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "╔у╔╘╔К╔ю╓ьйщб╦(_f)... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "╔у╔╘╔К╔ю╓ьйщб╦..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "йлл╬╓г╦╫╨ъ╓н╔у╔║╔╓╔К╓Рйщб╦"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "╩ьдЙ╓н╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рйщб╦"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "аВ©╝"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "╦Е╓гаВ©╝(_L)"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "╦Е╓гаВ©╝(_l)"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "HTML ╥а╪╟╓г╔А║╪╔К╓РаВ©╝"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╦Е╓гаВ©╝╓╥╓ч╓╧"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "╔А╔ц╔╩║╪╔╦╓Р╨ёаВ©╝╓╥╓ч╓╧"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "╓Ё╓н╔А╔ц╔╩║╪╔╦╓Р╨ёаВ©╝╓╥╓ч╓╧"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Sets something as bold"
-msgstr ""
-
-#: po/tmp/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "е╨иу╓ни╫╪╗ / хСи╫╪╗"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "е╨иу╓Ри╫╪╗(_a)"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "е╨иу╓Ри╫╪╗"
 
-#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "╔ф╔╜╔╧╔х╔у╔║╔╓╔К╓РачфЧ... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "Ё╚╓╞(_O)..."
 
@@ -6532,6 +6562,13 @@ msgstr "юъдЙ(_S)"
 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
+msgid "%A, %B %d, %Y"
+msgstr "%Y/%B/%d %A"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "╩Н╟ф"
@@ -6608,13 +6645,6 @@ msgstr "╡Я╣д╫╙н╩╩Ч╢ж(_e):"
 msgid "All Attendees"
 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
-msgid "%A, %B %d, %Y"
-msgstr "%Y/%B/%d %A"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6645,177 +6675,65 @@ msgstr "%p %I:%M"
 msgid "Group %i"
 msgstr "╔╟╔К║╪╔в %i"
 
-#: camel/providers/imap/camel-imap-auth.c:124
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kerberos ╔а╔╠╔ц╔х╓Р╪Хфю╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:195
-msgid "Bad authentication response from server."
-msgstr "╔╣║╪╔п╓╚╓И╢ж╟Ц╓ц╓©г╖╬з╠ЧеЗ╓╛╓╒╓Й╓ч╓╥╓©"
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "UNIX MH ╥а╪╟╓н╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й (CamelLocal ╔п║╪╔╦╔Г╔С)"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "UNIX mbox ╥а╪╟╓н╔А║╪╔К╔у╔║╔╓╔К (CamelLocal ╔п║╪╔╦╔Г╔С)"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr ""
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "йщб╦╓╣╓Л╓©╔К║╪╔х %s ╓одл╬О╓н╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "╔у╔╘╔К╔ю╓Р╪Хфю╫пмХ╓ч╓╩╓С: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr ""
-
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "╔М║╪╔╚╔К╔у╔╘╔К╔ю╓о╔м╔╧╔х╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
+#~ msgid "Could not create summary"
+#~ msgstr "мвлС╓Р╨Ню╝╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "╔у╔╘╔К╔ю╓Р %s ╓╚╓И %s ╓ь╔Й╔м║╪╔Ю╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+#~ msgid "Cannot append message to mbox file: %s"
+#~ msgstr "mbox ╔у╔║╔╓╔К╓к╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "╔у╔╘╔К╔ю╓╚╓И╔╣╔ч╔Й║╪╔у╔║╔╓╔К `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+#~ msgid "Cannot get message: %s"
+#~ msgstr "╔А╔ц╔╩║╪╔╦╓Р╪Хфю╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr ""
-"╔у╔╘╔К╔ю╓╚╓И╔╓╔С╔г╔ц╔╞╔╧╔у╔║╔╓╔К `%s' ╓Р╨О╫Э╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "UNIX mbox ╥а╪╟╓н╔А║╪╔К╔у╔║╔╓╔К"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "maildir ╥а╪╟╓н╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "╔у╔╘╔К╔ю╓Р %s ╓╚╓И %s ╓ь╔Й╔м║╪╔Ю╫пмХ╓ч╓╩╓С╓г╓╥╓©: ╟╦юХ╓╛б╦╨ъ╓╥╓ч╓╧"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "╓╫╓н╓Х╓╕╓й╔А╔ц╔╩║╪╔╦╓о╓╒╓Й╓ч╓╩╓С"
+#~ msgid "Mbox folders may not be nested."
+#~ msgstr "Mbox ╔у╔╘╔К╔ю╓о╔м╔╧╔х╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
-msgid "Invalid message contents"
-msgstr "╔А╔ц╔╩║╪╔╦╓нфБмф╓ол╣╦З╓г╓╧"
+#~ msgid "Could not open summary %s"
+#~ msgstr "мвлС %s ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©"
 
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' ╓о maildir ╥а╪╟╓н╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
+#~ msgid "Summary mismatch, aborting sync"
+#~ msgstr "мвлС╓╛ит╟Лцв, ф╠╢Э╓╛цФцг╓╥╓ч╓╥╓©"
 
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "maildir ╥а╪╟╓н╔г╔ё╔Л╔╞╔х╔Й╓г╓о╓╒╓Й╓ч╓╩╓С"
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "мвлС╓╛ит╟Лцв, X-Evolution ╔ь╔ц╔ю╓╛╦╚иу╓╚╓Й╓ч╓╩╓С"
 
-#: camel/providers/local/camel-mbox-folder.c:195
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "mailbox╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С: %s: %s\n"
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "╫пно╔у╔║╔╓╔К╓ь╔г║╪╔©╓Р╔Ё╔т║╪╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "mbox ╔у╔║╔╓╔К╓к╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
+#~ msgid "Could not load or create summary"
+#~ 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
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"╔А╔ц╔╩║╪╔╦ %s ╓Р╔у╔╘╔К╔ю %s ╓╚╓И╪Хфю╫пмХ╓ч╓╩╓С\n"
-"  %s"
+#~ msgid "Cannot append message to mh folder: %s"
+#~ msgstr "mh ╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:358
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr ""
+#~ msgid "UNIX MH-format mail directories"
+#~ msgstr "UNIX MH ╥а╪╟╓н╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr ""
+#~ msgid "Could not rename folder `%s': %s"
+#~ msgstr "╔у╔╘╔К╔ю `%s' ╓Р╔Й╔м║╪╔Ю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:234
-#, fuzzy, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "╔у╔╘╔К╔ю╓РЁ╚╓╠╓ч╓╩╓С╓г╓╥╓©: ╔А╔ц╔╩║╪╔╦╔Й╔╧╔х╓ол╓╢╟ю╝╓г╓╧"
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "╔у╔╘╔К╔ю `%s' ╓Р╔Й╔м║╪╔Ю╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s ╓об╦╨ъ╓╥╓ч╓╧"
 
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH ╔у╔╘╔К╔ю╓о╔м╔╧╔х╓╧╓К╓Ё╓х╓╛╫пмХ╓ч╓╩╓С"
 
-#: camel/providers/local/camel-mbox-summary.c:341
-#, fuzzy, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "%s ╓Р fork ╫пмХ╓ч╓╩╓С: %s"
+#~ msgid "Local mail directory %s"
+#~ msgstr "╔М║╪╔╚╔К╔А║╪╔К╔г╔ё╔Л╔╞╔х╔Й %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
-#, fuzzy, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr ""
-"╔у╔╘╔К╔ю `%s' ╓РЁ╚╓╞╓Ё╓х╓╛╫пмХ╓ч╓╩╓С╓г╓╥╓©:\n"
-"%s"
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "%s ╓ь╓н╔я╔╓╔в╓╛╨Ню╝╓г╓╜╓ч╓╩╓С╓г╓╥╓©: %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
-#, fuzzy
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "мвлС╓╛ит╟Лцв, ф╠╢Э╓╛цФцг╓╥╓ч╓╥╓©"
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "%s ╓Р╪б╧т╫пмХ╓ч╓╩╓С╓г╓╥╓©: %s\n"
 
-#: camel/providers/local/camel-mbox-summary.c:579
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "╨Н╤х mailbox ╓ь╫Я╓╜╫п╓╥цФ╓к╔╗╔И║╪: %s: %s"
+#~ msgid "Cannot fork %s: %s"
+#~ msgstr "%s ╓Р fork ╫пмХ╓ч╓╩╓С: %s"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "mh ╔у╔╘╔К╔ю╓ь╔А╔ц╔╩║╪╔╦╓Рди╡ц╫пмХ╓ч╓╩╓С: %s: %s"
+#~ msgid "Bold"
+#~ msgstr "бю╩З"
diff --git a/po/ko.po b/po/ko.po
index 6b6103ad56..8e76b3a0ce 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution CVS20000808\n"
-"POT-Creation-Date: 2000-09-08 00:02+0900\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-09-08 17:08+0900\n"
 "Last-Translator: Sung-Hyun Nam <namsh@kldp.org>\n"
 "Language-Team: korean <ko@li.org>\n"
@@ -12,643 +12,409 @@ msgstr ""
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
-#: addressbook/backend/ebook/load-pine-addressbook.c:16
-#: addressbook/backend/ebook/test-client-list.c:18
-#: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1215
-#: addressbook/gui/component/addressbook-factory.c:37
-#: addressbook/gui/minicard/test-minicard-view.c:45
-#: calendar/conduits/calendar/calendar-conduit.c:1669
-#: calendar/conduits/todo/todo-conduit.c:1298 calendar/gui/main.c:55
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
-
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
-#.
-#: addressbook/conduit/address-conduit-control-applet.c:54
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
-#: calendar/conduits/todo/todo-conduit-control-applet.c:55
-msgid "Disabled"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:55
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
-#: calendar/conduits/todo/todo-conduit-control-applet.c:56
-msgid "Synchronize"
-msgstr "╣©╠Бх╜"
-
-#: addressbook/conduit/address-conduit-control-applet.c:56
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
-#: calendar/conduits/todo/todo-conduit-control-applet.c:57
-msgid "Copy From Pilot"
-msgstr "Pilotю╦╥н╨нем ╨╧╩Г"
-
-#: addressbook/conduit/address-conduit-control-applet.c:57
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
-#: calendar/conduits/todo/todo-conduit-control-applet.c:58
-msgid "Copy To Pilot"
-msgstr "Pilot╥н ╨╧╩Г"
-
-#: addressbook/conduit/address-conduit-control-applet.c:58
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
-#: calendar/conduits/todo/todo-conduit-control-applet.c:59
-msgid "Merge From Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:59
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
-#: calendar/conduits/todo/todo-conduit-control-applet.c:60
-msgid "Merge To Pilot"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:143
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
-#: calendar/conduits/todo/todo-conduit-control-applet.c:144
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
-msgstr ""
-
-#: addressbook/conduit/address-conduit-control-applet.c:145
-msgid "Gpilotd address conduit"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:3046
+#, fuzzy
+msgid "Card: "
+msgstr "юз╣©бВ"
 
-#: addressbook/conduit/address-conduit-control-applet.c:146
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
-#: calendar/conduits/todo/todo-conduit-control-applet.c:147
-msgid "(C) 1998 the Free Software Foundation"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:3048
+#, fuzzy
+msgid ""
+"\n"
+"Name: "
+msgstr "юл╦╖:"
 
-#: addressbook/conduit/address-conduit-control-applet.c:148
-msgid "Configuration utility for the address conduit.\n"
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:149
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
-#: calendar/conduits/todo/todo-conduit-control-applet.c:150
-msgid "gnome-unknown.xpm"
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:190
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
-#: calendar/conduits/todo/todo-conduit-control-applet.c:191
-msgid "Synchronize Action"
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:261
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
-#: calendar/conduits/todo/todo-conduit-control-applet.c:262
-msgid "Conduit state"
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:315
-#: addressbook/conduit/address-conduit-control-applet.c:328
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
-#: calendar/conduits/todo/todo-conduit-control-applet.c:316
-#: calendar/conduits/todo/todo-conduit-control-applet.c:329
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
+"\n"
+"  Suffix:     "
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:334
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
-#: calendar/conduits/todo/todo-conduit-control-applet.c:335
-msgid "Not connected to the gnome-pilot daemon"
-msgstr "gnome-pilot ╣╔╦С©║ ©╛╟А╣г╬НюжаЖ╬йю╫"
-
-#: addressbook/conduit/address-conduit-control-applet.c:339
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
-#: calendar/conduits/todo/todo-conduit-control-applet.c:340
+#: addressbook/backend/ebook/e-card.c:3067
+#, fuzzy
 msgid ""
-"An error occured when trying to fetch\n"
-"pilot list from the gnome-pilot daemon"
-msgstr ""
+"\n"
+"Birth Date: "
+msgstr "╫цюш Ё╞б╔(_r):"
 
-#: addressbook/conduit/address-conduit.c:127
-#: addressbook/conduit/address-conduit.c:141
-msgid "BLARG\n"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:3078
+#, fuzzy
+msgid ""
+"\n"
+"Address:"
+msgstr "аж╪р:"
 
-#: addressbook/conduit/address-conduit.c:471
-#, c-format
-msgid "Address holds %ld address entries"
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:497
-#: addressbook/conduit/address-conduit.c:499
-msgid "Could not start addressbook server"
-msgstr "аж╪р╥о ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
-
-#: addressbook/conduit/address-conduit.c:512
-#: addressbook/conduit/address-conduit.c:515
-msgid "Could not read pilot's Address application block"
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:853
-msgid "Error while communicating with address server"
-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"
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
 msgstr ""
 
-#: addressbook/contact-editor/categories-strings.h:8
-msgid "Item(s) belong to these categories:"
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
 msgstr ""
 
-#: addressbook/contact-editor/categories-strings.h:9
-msgid "Available Categories:"
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:665
-#: calendar/gui/dialogs/task-editor.c:217 calendar/gui/event-editor.c:1154
-msgid "FIXME: _Appointment"
-msgstr "╟Мд╔©╧а╓: ╬Ю╪с(_A)"
-
-#: addressbook/contact-editor/e-contact-editor.c:666
-#: calendar/gui/dialogs/task-editor.c:218 calendar/gui/event-editor.c:1155
-msgid "FIXME: Meeting Re_quest"
-msgstr "╟Мд╔©╧а╓: х╦юг ©Дц╩(_q)"
-
-#: addressbook/contact-editor/e-contact-editor.c:668
-#: calendar/gui/dialogs/task-editor.c:216 calendar/gui/event-editor.c:1157
-msgid "FIXME: _Mail Message"
-msgstr "╟Мд╔©╧а╓: фМаЖ ╦ч╪╪аЖ(_M)"
-
-#: addressbook/contact-editor/e-contact-editor.c:669
-#: calendar/gui/dialogs/task-editor.c:219 calendar/gui/event-editor.c:1158
-msgid "FIXME: _Contact"
-msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
-
-#: addressbook/contact-editor/e-contact-editor.c:670
-#: calendar/gui/dialogs/task-editor.c:213
-#: calendar/gui/dialogs/task-editor.c:220 calendar/gui/event-editor.c:1159
-msgid "FIXME: _Task"
-msgstr "╟Мд╔©╧а╓: юш╬В(_T)"
-
-#: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/dialogs/task-editor.c:214
-#: calendar/gui/dialogs/task-editor.c:221 calendar/gui/event-editor.c:1160
-msgid "FIXME: Task _Request"
-msgstr "╟Мд╔©╧а╓: юш╬В ©Дц╩(_R)"
-
-#: addressbook/contact-editor/e-contact-editor.c:672
-#: calendar/gui/dialogs/task-editor.c:222 calendar/gui/event-editor.c:1161
-msgid "FIXME: _Journal Entry"
-msgstr "╟Мд╔©╧а╓: юБаЖ гв╦Я(_J)"
-
-#: addressbook/contact-editor/e-contact-editor.c:673
-#: calendar/gui/dialogs/task-editor.c:223 calendar/gui/event-editor.c:1162
-msgid "FIXME: _Note"
-msgstr "╟Мд╔©╧а╓: ЁКф╝(_N)"
-
-#: addressbook/contact-editor/e-contact-editor.c:675
-#: addressbook/contact-editor/e-contact-editor.c:780
-#: calendar/gui/dialogs/task-editor.c:225
-#: calendar/gui/dialogs/task-editor.c:332 calendar/gui/event-editor.c:1164
-#: calendar/gui/event-editor.c:1272
-msgid "FIXME: Ch_oose Form..."
-msgstr "╟Мд╔©╧а╓: ╪╠ец..."
-
-#: addressbook/contact-editor/e-contact-editor.c:680
-#: calendar/gui/dialogs/task-editor.c:230 calendar/gui/event-editor.c:1169
-msgid "FIXME: _Memo Style"
-msgstr "╟Мд╔©╧а╓: ╦ч╦П гЭ╫д(_M)"
-
-#: addressbook/contact-editor/e-contact-editor.c:682
-#: calendar/gui/dialogs/task-editor.c:232 calendar/gui/event-editor.c:1171
-msgid "FIXME: Define Print _Styles..."
-msgstr "╟Мд╔©╧а╓: юн╪Б гЭ╫д а╓юг(_S)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:689
-#: calendar/gui/dialogs/task-editor.c:239 calendar/gui/event-editor.c:1178
-msgid "FIXME: S_end"
-msgstr "╟Мд╔©╧а╓: ╪ш╫е(_e)"
-
-#: addressbook/contact-editor/e-contact-editor.c:693
-#: calendar/gui/dialogs/task-editor.c:243 calendar/gui/event-editor.c:1182
-msgid "FIXME: Save Attac_hments..."
-msgstr "╟Мд╔©╧а╓: ц╥╨нфдюо юЗюЕ..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:695
-#: calendar/gui/event-editor.c:1184
-msgid "_Delete"
-msgstr "╩Ха╕(_D)"
-
-#: addressbook/contact-editor/e-contact-editor.c:696
-#: calendar/gui/dialogs/task-editor.c:246 calendar/gui/event-editor.c:1186
-msgid "FIXME: _Move to Folder..."
-msgstr "╟Мд╔©╧а╓: фЗ╢У╥н юл╣©(_M)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:697
-#: calendar/gui/dialogs/task-editor.c:247 calendar/gui/event-editor.c:1187
-msgid "FIXME: Cop_y to Folder..."
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/dialogs/task-editor.c:249 calendar/gui/event-editor.c:1189
-msgid "Page Set_up"
-msgstr "бй ╪Ёа╓(_u)"
-
-#: addressbook/contact-editor/e-contact-editor.c:700
-#: calendar/gui/dialogs/task-editor.c:250 calendar/gui/event-editor.c:1190
-msgid "FIXME: Print Pre_view"
+#: addressbook/backend/ebook/e-card.c:3086
+msgid ""
+"\n"
+"  Country:     "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/dialogs/task-editor.c:271 calendar/gui/event-editor.c:1211
-msgid "FIXME: Paste _Special..."
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:726
-#: calendar/gui/dialogs/task-editor.c:276 calendar/gui/event-editor.c:1216
-msgid "FIXME: Mark as U_nread"
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:730
-#: calendar/gui/dialogs/task-editor.c:280 calendar/gui/event-editor.c:1220
-msgid "_Object"
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:735
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/dialogs/task-editor.c:285
-#: calendar/gui/dialogs/task-editor.c:293 calendar/gui/event-editor.c:1225
-#: calendar/gui/event-editor.c:1232
-msgid "FIXME: _Item"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:3138
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr "юл╦чюо 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:736
-#: addressbook/contact-editor/e-contact-editor.c:743
-#: calendar/gui/dialogs/task-editor.c:286
-#: calendar/gui/dialogs/task-editor.c:294 calendar/gui/event-editor.c:1226
-#: calendar/gui/event-editor.c:1233
-msgid "FIXME: _Unread Item"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:3141
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:"
+msgstr "юл╦чюо 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/dialogs/task-editor.c:288 calendar/gui/event-editor.c:1227
-msgid "FIXME: Fi_rst Item in Folder"
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:744
-#: calendar/gui/dialogs/task-editor.c:296 calendar/gui/event-editor.c:1234
-msgid "FIXME: _Last Item in Folder"
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:749
-#: calendar/gui/dialogs/task-editor.c:301 calendar/gui/event-editor.c:1239
-msgid "FIXME: _Standard"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:3174
+#, fuzzy
+msgid ""
+"\n"
+"Geo Location: "
+msgstr "ю╖д║:"
 
-#: addressbook/contact-editor/e-contact-editor.c:751
-#: calendar/gui/dialogs/task-editor.c:303 calendar/gui/event-editor.c:1241
-msgid "FIXME: __Formatting"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:3178
+#, fuzzy
+msgid ""
+"\n"
+"Business Role: "
+msgstr "аВюЕ 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:754
-#: calendar/gui/dialogs/task-editor.c:306 calendar/gui/event-editor.c:1244
-msgid "FIXME: _Customize..."
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:759
-#: calendar/gui/dialogs/task-editor.c:311 calendar/gui/event-editor.c:1249
-msgid "Pre_vious"
-msgstr "юлюЭ(_v)"
-
-#: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/dialogs/task-editor.c:312 calendar/gui/event-editor.c:1250
-msgid "Ne_xt"
-msgstr "╢ыю╫(_x)"
-
-#: addressbook/contact-editor/e-contact-editor.c:762
-#: calendar/gui/dialogs/task-editor.c:314 calendar/gui/event-editor.c:1254
-msgid "_Toolbars"
-msgstr "╣╣╠╦(_T)"
+#: addressbook/backend/ebook/e-card.c:3191
+#, fuzzy
+msgid ""
+"\n"
+"  Name:  "
+msgstr "юл╦╖:"
 
-#: addressbook/contact-editor/e-contact-editor.c:767
-#: calendar/gui/dialogs/task-editor.c:319 calendar/gui/event-editor.c:1259
-msgid "FIXME: _File..."
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:768
-#: calendar/gui/dialogs/task-editor.c:320 calendar/gui/event-editor.c:1260
-msgid "FIXME: It_em..."
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:769
-#: calendar/gui/dialogs/task-editor.c:321 calendar/gui/event-editor.c:1261
-msgid "FIXME: _Object..."
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/dialogs/task-editor.c:326 calendar/gui/event-editor.c:1266
-msgid "FIXME: _Font..."
-msgstr "╟Мд╔©╧а╓: ╠ш╡ц(_F)..."
-
-#: addressbook/contact-editor/e-contact-editor.c:775
-#: calendar/gui/dialogs/task-editor.c:327 calendar/gui/event-editor.c:1267
-msgid "FIXME: _Paragraph..."
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/dialogs/task-editor.c:334 calendar/gui/event-editor.c:1274
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:3199
+#, fuzzy
+msgid ""
+"\n"
+"Categories: "
+msgstr "╦Я╥о"
 
-#: addressbook/contact-editor/e-contact-editor.c:783
-#: calendar/gui/dialogs/task-editor.c:335 calendar/gui/event-editor.c:1275
-msgid "FIXME: D_esign a Form..."
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"Comment: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/dialogs/task-editor.c:337 calendar/gui/event-editor.c:1277
-msgid "FIXME: Publish _Form..."
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:786
-#: calendar/gui/dialogs/task-editor.c:338 calendar/gui/event-editor.c:1278
-msgid "FIXME: Pu_blish Form As..."
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/dialogs/task-editor.c:340 calendar/gui/event-editor.c:1280
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: 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/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
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
 
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/dialogs/task-editor.c:345 calendar/gui/event-editor.c:1285
-msgid "FIXME: _Spelling..."
+#. This array must be in the same order as enumerations
+#. in GnomePilotConduitSyncType as they are used as index.
+#. Custom type implies Disabled state.
+#.
+#: addressbook/conduit/address-conduit-control-applet.c:77
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
+#: calendar/conduits/todo/todo-conduit-control-applet.c:77
+msgid "Disabled"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:795
-#: calendar/gui/dialogs/task-editor.c:350 calendar/gui/event-editor.c:1290
-msgid "_Forms"
-msgstr "гЭ╫д(_F)"
-
-#: addressbook/contact-editor/e-contact-editor.c:800
-msgid "FIXME: _New Contact"
-msgstr ""
+#: addressbook/conduit/address-conduit-control-applet.c:78
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
+#: calendar/conduits/todo/todo-conduit-control-applet.c:78
+msgid "Synchronize"
+msgstr "╣©╠Бх╜"
 
-#: addressbook/contact-editor/e-contact-editor.c:801
-msgid "FIXME: New _Contact from Same Company"
-msgstr ""
+#: addressbook/conduit/address-conduit-control-applet.c:79
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
+#: calendar/conduits/todo/todo-conduit-control-applet.c:79
+msgid "Copy From Pilot"
+msgstr "Pilotю╦╥н╨нем ╨╧╩Г"
 
-#: addressbook/contact-editor/e-contact-editor.c:803
-msgid "FIXME: New _Letter to Contact"
-msgstr ""
+#: addressbook/conduit/address-conduit-control-applet.c:80
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
+#: calendar/conduits/todo/todo-conduit-control-applet.c:80
+msgid "Copy To Pilot"
+msgstr "Pilot╥н ╨╧╩Г"
 
-#: addressbook/contact-editor/e-contact-editor.c:804
-msgid "FIXME: New _Message to Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:81
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
+#: calendar/conduits/todo/todo-conduit-control-applet.c:81
+msgid "Merge From Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:805
-msgid "FIXME: New Meetin_g with Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:82
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
+#: calendar/conduits/todo/todo-conduit-control-applet.c:82
+msgid "Merge To Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:806
-msgid "FIXME: _Plan a Meeting..."
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:807
-msgid "FIXME: New _Task for Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+msgid "Original Author:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:808
-msgid "FIXME: New _Journal Entry for Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:123
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:810
-msgid "FIXME: _Flag for Follow Up..."
+#: addressbook/conduit/address-conduit-control-applet.c:127
+msgid "Evolution Addressbook Conduit"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:811
-msgid "FIXME: _Display Map of Address"
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:812
-msgid "FIXME: _Open Web Page"
+#: addressbook/conduit/address-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution addressbook conduit.\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:814
-msgid "FIXME: Forward as _vCard"
+#: addressbook/conduit/address-conduit-control-applet.c:131
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
+msgid "gnome-unknown.xpm"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:815
-#: calendar/gui/dialogs/task-editor.c:367 calendar/gui/event-editor.c:1303
-msgid "FIXME: For_ward"
-msgstr "╟Мд╔©╧а╓: юЭ╢ч(_w)"
-
-#: addressbook/contact-editor/e-contact-editor.c:827
-#: calendar/gui/dialogs/task-editor.c:380 calendar/gui/event-editor.c:1316
-msgid "_Insert"
-msgstr "╩Пют(_I)"
-
-#: addressbook/contact-editor/e-contact-editor.c:828
-#: calendar/gui/dialogs/task-editor.c:381 calendar/gui/event-editor.c:1317
-msgid "F_ormat"
-msgstr "гЭ╫д(_o)"
-
-#: addressbook/contact-editor/e-contact-editor.c:829
-#: addressbook/gui/component/addressbook.c:544
-#: calendar/gui/dialogs/task-editor.c:382 calendar/gui/event-editor.c:1318
-msgid "_Tools"
-msgstr "╣╣╠╦(_T)"
-
-#: addressbook/contact-editor/e-contact-editor.c:830
-#: calendar/gui/dialogs/task-editor.c:383 calendar/gui/event-editor.c:1319
-msgid "Actio_ns"
-msgstr "гЮ╣©(_n)"
-
-#: addressbook/contact-editor/e-contact-editor.c:861
-msgid "Save and Close"
-msgstr "юЗюЕхд ╦╤д╖"
-
-#: addressbook/contact-editor/e-contact-editor.c:862
-msgid "Save the appointment and close the dialog box"
-msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
-
-#: addressbook/contact-editor/e-contact-editor.c:866
-#: calendar/gui/calendar-commands.c:652
-msgid "Print..."
-msgstr "юн╪Б..."
-
-#: addressbook/contact-editor/e-contact-editor.c:867
-#: calendar/gui/dialogs/task-editor.c:415 calendar/gui/event-editor.c:1362
-msgid "Print this item"
-msgstr "юл гв╦Яю╩ юн╪Б"
-
-#: addressbook/contact-editor/e-contact-editor.c:870
-#: calendar/gui/dialogs/task-editor.c:416 calendar/gui/event-editor.c:1367
-msgid "FIXME: Insert File..."
+#: addressbook/conduit/address-conduit-control-applet.c:162
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
+#: calendar/conduits/todo/todo-conduit-control-applet.c:162
+msgid "Synchronize Action"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:871
-#: calendar/gui/dialogs/task-editor.c:417 calendar/gui/event-editor.c:1368
-msgid "Insert a file as an attachment"
-msgstr "ц╥╨н╥н╪╜ фдюою╩ ╩Пютгя╢ы"
-
-#: addressbook/contact-editor/e-contact-editor.c:874
-#: addressbook/gui/component/addressbook.c:442
-#: calendar/gui/e-calendar-table.c:323
-#: calendar/gui/event-editor-dialog.glade.h:92
-#: calendar/gui/event-editor.c:1349 mail/folder-browser-factory.c:50
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:160
-msgid "Delete"
-msgstr "╩Ха╕"
-
-#: addressbook/contact-editor/e-contact-editor.c:875
-#: calendar/gui/dialogs/task-editor.c:426
-msgid "Delete this item"
-msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
-
-#: addressbook/contact-editor/e-contact-editor.c:879
-#: calendar/gui/dialogs/task-editor.c:428 calendar/gui/event-editor.c:1378
-msgid "FIXME: Previous"
+#: addressbook/conduit/address-conduit-control-applet.c:214
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
+msgid "Conduit state"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:880
-#: calendar/gui/dialogs/task-editor.c:429 calendar/gui/event-editor.c:1379
-msgid "Go to the previous item"
-msgstr "юлюЭ гв╦Яю╦╥н юл╣©"
-
-#: addressbook/contact-editor/e-contact-editor.c:882
-#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1381
-msgid "FIXME: Next"
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
+msgid ""
+"No pilot configured, please choose the\n"
+"'Pilot Link Properties' capplet first."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:883
-#: calendar/gui/dialogs/task-editor.c:431 calendar/gui/event-editor.c:1382
-msgid "Go to the next item"
-msgstr "╢ыю╫ гв╦Яю╦╥н юл╣©"
+#: addressbook/conduit/address-conduit-control-applet.c:285
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
+#: calendar/conduits/todo/todo-conduit-control-applet.c:285
+msgid "Not connected to the gnome-pilot daemon"
+msgstr "gnome-pilot ╣╔╦С©║ ©╛╟А╣г╬НюжаЖ╬йю╫"
 
-#: addressbook/contact-editor/e-contact-editor.c:886
-#: calendar/gui/dialogs/task-editor.c:432 calendar/gui/event-editor.c:1384
-msgid "FIXME: Help"
+#: addressbook/conduit/address-conduit-control-applet.c:290
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
+msgid ""
+"An error occured when trying to fetch\n"
+"pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:887
-#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1385
-msgid "See online help"
-msgstr "©б╤Сюн ╣╣©Р╦╩ю╩ ╨╦©╘аь╢ы"
-
-#: addressbook/contact-editor/e-contact-editor.c:1343
-msgid "Assistant"
-msgstr "а╤╪Ж"
-
-#: addressbook/contact-editor/e-contact-editor.c:1344
-#: addressbook/contact-editor/e-contact-editor.c:1448
-msgid "Business"
-msgstr "аВюЕ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1345
-msgid "Business 2"
-msgstr "аВюЕ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1346
-msgid "Business Fax"
-msgstr "аВюЕ фя╫╨"
-
-#: addressbook/contact-editor/e-contact-editor.c:1347
-msgid "Callback"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1348
-msgid "Car"
-msgstr "юз╣©бВ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1349
-msgid "Company"
-msgstr "х╦╩Г"
-
-#: addressbook/contact-editor/e-contact-editor.c:1350
-#: addressbook/contact-editor/e-contact-editor.c:1449
-msgid "Home"
-msgstr "аЩ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1351
-msgid "Home 2"
-msgstr "аЩ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1352
-msgid "Home Fax"
-msgstr "аЩ фя╫╨"
-
-#: addressbook/contact-editor/e-contact-editor.c:1353
-msgid "ISDN"
+#: addressbook/conduit/address-conduit.c:210
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1354
-msgid "Mobile"
-msgstr "хч╢КюЭх╜"
-
-#: addressbook/contact-editor/e-contact-editor.c:1355
-#: addressbook/contact-editor/e-contact-editor.c:1450
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "╠Бе╦"
-
-#: addressbook/contact-editor/e-contact-editor.c:1356
-msgid "Other Fax"
-msgstr "╠Бе╦ фя╫╨"
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
+#, fuzzy
+msgid "Could not start wombat server"
+msgstr "gnomecal ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: addressbook/contact-editor/e-contact-editor.c:1357
-msgid "Pager"
-msgstr "╩ъ╩ъ"
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
+#, fuzzy
+msgid "Could not start wombat"
+msgstr "gnomecal ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: addressbook/contact-editor/e-contact-editor.c:1358
-msgid "Primary"
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
+msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1359
-msgid "Radio"
+#.
+#. * 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/e-contact-editor.c:1360
-msgid "Telex"
+#: addressbook/contact-editor/categories-strings.h:8
+msgid "Item(s) belong to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1361
-msgid "TTY/TDD"
+#: addressbook/contact-editor/categories-strings.h:9
+msgid "Available Categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1405
-msgid "Primary Email"
-msgstr "юл╦чюо"
-
-#: addressbook/contact-editor/e-contact-editor.c:1406
-msgid "Email 2"
-msgstr "юл╦чюо 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1407
-msgid "Email 3"
-msgstr "юл╦чюо 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"а╓╦╩╥н юл ©╛╤ТцЁ╦╕\n"
-"аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "©╛╤ТцЁ╦╕ ╩Ха╕гр╠Н©Д?"
 
@@ -661,6 +427,11 @@ msgstr "©╛╤ТцЁ╦╕ ╩Ха╕гр╠Н©Д?"
 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
+msgid "_Delete"
+msgstr "╩Ха╕(_D)"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "юЭх╜ гЭеб"
@@ -670,9 +441,13 @@ msgstr "юЭх╜ гЭеб"
 msgid "New phone type"
 msgstr "╩У юЭх╜ гЭеб"
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:90 mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "цъ╟║"
 
@@ -697,52 +472,58 @@ msgid "Wants to receive _HTML mail"
 msgstr "HTMLгЭ╫д фМаЖ ╩Г©К(_H)"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "Address:"
-msgstr "аж╪р:"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Business"
 msgstr "аВюЕ(_B)"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Home"
 msgstr "аЩ(_H)"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
 msgid "Business _Fax"
 msgstr "аВюЕ фя╫╨(_F)"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
 msgid "_Mobile"
 msgstr "хч╢КюЭх╜(_M)"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "юл╦чюо"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "аВюЕ(_u)"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
 msgid "_This is the mailing address"
 msgstr "юл╟мю╨ юЭюз©ЛфМ аж╪рют╢о╢ы(_T)"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
 msgid "C_ontacts..."
 msgstr "©╛╤ТцЁ(_C)..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:27
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "╦Я╥о(_t)..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
 msgstr "аВгт(_J):"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Company:"
 msgstr "х╦╩Г(_C):"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#, fuzzy
+msgid "_Address..."
+msgstr "аж╪р"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "юо╧щ а╓╨╦"
 
@@ -787,40 +568,161 @@ msgid "No_tes:"
 msgstr "ЁКф╝(_t):"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:33
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "юз╪╪хВ"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "а╤╪Ж"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "аВюЕ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "аВюЕ 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "аВюЕ фя╫╨"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "юз╣©бВ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "х╦╩Г"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "аЩ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "аЩ 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "аЩ фя╫╨"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "╠Бе╦"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "╠Бе╦ фя╫╨"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "╩ъ╩ъ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "юл╦чюо 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "юл╦чюо 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fullname-strings.h:7
-msgid "Check Full Name"
-msgstr "юЭц╪ юл╦╖ х╝юн"
+#: po/tmp/fulladdr.glade.h:6
+#, fuzzy
+msgid "Address _2:"
+msgstr "аж╪р:"
 
-#: addressbook/contact-editor/fullname-strings.h:8
-msgid "_Title:"
-msgstr "а╕╦Я(_T):"
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:9
-msgid "_First:"
-msgstr "╪╨(_F):"
+#: po/tmp/fulladdr.glade.h:8
+#, fuzzy
+msgid "Check Address"
+msgstr "аж╪р"
 
-#: addressbook/contact-editor/fullname-strings.h:10
-msgid "_Middle:"
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:11
-msgid "_Last:"
-msgstr "юл╦╖(_L):"
+#: po/tmp/fulladdr.glade.h:10
+#, fuzzy
+msgid "Finland"
+msgstr "цё╠Б"
 
-#: addressbook/contact-editor/fullname-strings.h:12
-msgid "_Suffix:"
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:13
+#: po/tmp/fulladdr.glade.h:12
+#, fuzzy
+msgid "_Address:"
+msgstr "аж╪р:"
+
+#: po/tmp/fulladdr.glade.h:13
+#, fuzzy
+msgid "_City:"
+msgstr "╩Щюо(_B):"
+
+#: po/tmp/fulladdr.glade.h:14
+msgid "_PO Box:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:15
+msgid "_State/Province:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:16
+msgid "_ZIP Code:"
+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/fullname-strings.h:7
+msgid "Check Full Name"
+msgstr "юЭц╪ юл╦╖ х╝юн"
+
+#: addressbook/contact-editor/fullname-strings.h:8
 msgid ""
 "\n"
 "Mr.\n"
@@ -828,7 +730,7 @@ msgid ""
 "Dr.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:18
+#: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
 "\n"
 "Sr.\n"
@@ -839,63 +741,44 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:436
-#: calendar/gui/calendar-commands.c:526 notes/component-factory.c:27
-msgid "New"
-msgstr "╩У ©╛╤ТцЁ"
-
-#: addressbook/gui/component/addressbook.c:436
-msgid "Create a new contact"
-msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
-
-#: addressbook/gui/component/addressbook.c:440
-msgid "Find"
-msgstr "цё╠Б"
-
-#: addressbook/gui/component/addressbook.c:440
-msgid "Find a contact"
-msgstr "©╛╤ТцЁ цё╬ф╨╩╢ы"
-
-#: addressbook/gui/component/addressbook.c:441
-#: calendar/gui/calendar-commands.c:531 mail/folder-browser-factory.c:48
-#: mail/mail-view.c:158
-msgid "Print"
-msgstr "юн╪Б"
+#: addressbook/contact-editor/fullname-strings.h:21
+msgid "_First:"
+msgstr "╪╨(_F):"
 
-#: addressbook/gui/component/addressbook.c:441
-msgid "Print contacts"
-msgstr "©╛╤ТцЁ╦╕ юн╪Бгя╢ы"
+#: addressbook/contact-editor/fullname-strings.h:22
+msgid "_Title:"
+msgstr "а╕╦Я(_T):"
 
-#: addressbook/gui/component/addressbook.c:442
-msgid "Delete a contact"
-msgstr "©╛╤ТцЁ╦╕ аЖ©Н╢ы"
+#: addressbook/contact-editor/fullname-strings.h:23
+msgid "_Middle:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:511
-msgid "_Print Contacts..."
-msgstr "©╛╤ТцЁ╦╕ юн╪Б(_P)..."
+#: addressbook/contact-editor/fullname-strings.h:24
+msgid "_Last:"
+msgstr "юл╦╖(_L):"
 
-#: addressbook/gui/component/addressbook.c:521
-#: addressbook/gui/component/addressbook.c:1052
-msgid "As _Table"
+#: addressbook/contact-editor/fullname-strings.h:25
+msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:528
-msgid "_New Contact"
-msgstr "╩У ©╛╤ТцЁ(_N)"
-
-#: addressbook/gui/component/addressbook.c:536
-msgid "N_ew Directory Server"
+#: addressbook/gui/component/addressbook.c:263
+msgid "As _Minicards"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:550
-msgid "_Search for contacts"
+#.
+#. * 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
+msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:632
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "аж╪р╥ою╩ ©╜╪Ж╟║ ╬Ь╫ю╢о╢ы"
 
-#: addressbook/gui/component/addressbook.c:637
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -904,201 +787,210 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:920
-#: addressbook/gui/minicard/e-minicard.c:332
-msgid "Save as VCard"
-msgstr "VCard╥н юЗюЕ"
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+msgid "Show All"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#, fuzzy
+msgid "Advanced..."
+msgstr "цъ╟║..."
 
-#: addressbook/gui/component/addressbook.c:1022
-msgid "* Click here to add a contact *"
+#: addressbook/gui/component/addressbook.c:533
+msgid "Any field contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1059
-msgid "As _Minicards"
+#: addressbook/gui/component/addressbook.c:534
+msgid "Name contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:535
+msgid "Email contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1110
+#: addressbook/gui/component/addressbook.c:621
 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 Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/alphabet.glade.h:7
-msgid "window2"
-msgstr ""
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
+msgid "Description:"
+msgstr "╪Ё╦М:"
+
+#: po/tmp/ldap-server-dialog.glade.h:7
+msgid "LDAP Server:"
+msgstr "LDAP ╪╜╧Ж:"
 
-#: addressbook/gui/component/alphabet.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "юл╦╖:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr "фВф╝ ╧Ьхё:"
+
+#: po/tmp/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr "╥Гф╝ 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
+msgid "Find..."
+msgstr "цё╠Б..."
+
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "╪╠ецгя юл╦╖"
+
+#: po/tmp/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr "╦Я╥ою╦╥н╨нем юл╦╖ю╩ ╪╠ец:"
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "╟к╩Ж"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr ""
 
-#: addressbook/gui/component/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/component/e-ldap-storage.c:88
-msgid "External Directories"
-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/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "Description:"
-msgstr "╪Ё╦М:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
-msgid "LDAP Server:"
-msgstr "LDAP ╪╜╧Ж:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "фВф╝ ╧Ьхё:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
-msgstr "╥Гф╝ DN:"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-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/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "╪╠ецгя юл╦╖"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Find..."
-msgstr "цё╠Б..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
-msgid "Select name from List:"
-msgstr "╦Я╥ою╦╥н╨нем юл╦╖ю╩ ╪╠ец:"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "╧ч╢б╩Г╤В ╦Я╥о"
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
+msgid "Save as VCard"
+msgstr "VCard╥н юЗюЕ"
 
-#: addressbook/gui/minicard/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-minicard-control.c:278
 msgid "Save in addressbook"
 msgstr "аж╪р╥о©║ юЗюЕ"
 
-#: addressbook/gui/minicard/e-minicard-view.c:110
+#: addressbook/gui/widgets/e-minicard-view.c:111
 msgid ""
 "\n"
 "\n"
@@ -1107,481 +999,335 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/minicard/test-minicard-view.c:100
-msgid "Reflow Test"
-msgstr ""
-
-#: addressbook/gui/minicard/test-minicard-view.c:101
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr ""
-
-#: addressbook/gui/minicard/test-minicard-view.c:103
-msgid "This should test the reflow canvas item"
-msgstr ""
-
-#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
-#: addressbook/gui/search/e-addressbook-search-dialog.c:150
-#: mail/folder-browser.c:377
-msgid "Search"
-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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "бй ╪Ёа╓:"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "гЭ╫д юл╦╖:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "╧л╦╝╨╦╠Б:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 фВюнф╝ Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "╪Ёа╓"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 фВюнф╝ Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "фВгт:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "Ё║╢э ╨Я©Л╠Б:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "╪╫╪г:"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "╨╩╧╝"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "╬ф╥║:"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "╟╒ юЕ╦╤╢ы г╔а╕╢ч╠Б"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "╠ш╡ц..."
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "╩У бйю╩ ╫цюшгу╢о╢ы"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "╠ш╡ц"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "©╜ ╪Ж:"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "╡©╦╝╦╩:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "Ё║╢э ╨Я©Л╠Б:"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "гЭ╫д"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "╠ш╡ц"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "╦с╦╝╦╩:"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "╠ш╡ц..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "╦с╦╝╦╩/╡©╦╝╦╩"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "╦с╦╢╦╩"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 фВюнф╝ Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "╟╒ юЕ╦╤╢ы г╔а╕╢ч╠Б"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "╨╩╧╝"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "ЁТюл:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 фВюнф╝ Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "╦М╬о"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "фВгт:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "х╦╩Ж ╦М╬ою╦╥н юн╪Б"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "╟║╥н"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "гЭ╫д"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "©чбй:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "а╬юл"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "гЭеб:"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "©╘╧И"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:80
-msgid "label26"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "©╜ ╪Ж:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "╪Ёа╓"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "фЬ:"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "╧ФгБ"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "ЁТюл:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "бй"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "бй ╪Ёа╓:"
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "а╬юл"
+
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "╠чаЖ╧Ф╧Щ:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "©╘╧И"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "╪╪╥н"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "ю╖:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "╧л╦╝╨╦╠Б:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "╬ф╥║:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "х╦╩Ж ╦М╬ою╦╥н юн╪Б"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "©чбй:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "б╕╪Ж бй ╣заЩ╠Б"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "©ю╦╔бй:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "бй"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "╪╫╪г:"
+
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "╦М╬о"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "е╘╠Б:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "╧ФгБ"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "╪╪╥н"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "╩У бйю╩ ╫цюшгу╢о╢ы"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "╟║╥н"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "гЭ╫д юл╦╖:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "╦с╦╝╦╩:"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "ю╖:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "╡©╦╝╦╩:"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "гЭеб:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "б╕╪Ж бй ╣заЩ╠Б"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "фЬ:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "╦с╦╝╦╩/╡©╦╝╦╩"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr ""
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:596
+#. 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 "©ююЭ"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:595
+#. 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:146
-msgid "Gpilotd calendar conduit"
-msgstr ""
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
+#, fuzzy
+msgid "Evolution Calendar Conduit"
+msgstr "Evolution ╢эцЮ ╦╥╢К(_s)"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
-msgid "Configuration utility for the calendar conduit.\n"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:399
-#: calendar/conduits/calendar/calendar-conduit.c:1109
-#: calendar/conduits/todo/todo-conduit.c:443
-#: calendar/conduits/todo/todo-conduit.c:1025
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:776
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/todo/todo-conduit.c:707
-#: calendar/conduits/todo/todo-conduit.c:709
-msgid "Could not start gnomecal server"
-msgstr "gnomecal ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
-
-#: calendar/conduits/calendar/calendar-conduit.c:806
-#: calendar/conduits/calendar/calendar-conduit.c:809
-msgid "Could not read pilot's DateBook application block"
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
+msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:146
-msgid "Gpilotd todo conduit"
-msgstr ""
+#: calendar/conduits/todo/todo-conduit-control-applet.c:127
+#, fuzzy
+msgid "Evolution ToDo Conduit"
+msgstr "Evolution ╢эцЮ ╦╥╢К(_s)"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:149
-msgid "Configuration utility for the todo conduit.\n"
+#: calendar/conduits/todo/todo-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:737
-#: calendar/conduits/todo/todo-conduit.c:740
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:60
 msgid "Outline:"
 msgstr "ю╠╟Ш:"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:61
 msgid "Headings:"
 msgstr "╦с╦╢╦╩:"
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:62
 msgid "Empty days:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:63
 msgid "Appointments:"
 msgstr "╬Ю╪с"
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:64
 msgid "Highlighted day:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:65
 msgid "Day numbers:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:66
 msgid "Current day's number:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:66
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr "Ё╙аъ©║ гь╬ъ гр юо"
 
-#: calendar/gui/calendar-commands.c:67
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is due today:"
 msgstr "©ю╢ц гь╬ъ гр юо"
 
-#: calendar/gui/calendar-commands.c:68
+#: calendar/gui/calendar-commands.c:69
 msgid "To-Do item that is overdue:"
 msgstr "╧З╫А ╢йю╨ гь╬ъгр юо"
 
-#: calendar/gui/calendar-commands.c:175
-msgid "Gnome Calendar"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:178
-msgid "The GNOME personal calendar and schedule manager."
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:412 tests/ui-tests/message-browser.c:676
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "фдюоюл ╧ъ╟ъ╣гаЖ ╬й╬р╫ю╢о╢ы"
 
-#: calendar/gui/calendar-commands.c:436
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:475
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:504
-msgid "Day"
+#. strftime format of a weekday and a date.
+#: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+msgid "%a %m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:504
-msgid "Show 1 day"
-msgstr "го╥Г╬© ╨╦юл╠Б"
-
-#: calendar/gui/calendar-commands.c:507
-msgid "5 Days"
-msgstr "╢Е╩У╬© ╨╦юл╠Б"
-
-#: calendar/gui/calendar-commands.c:507
-msgid "Show the working week"
+#. 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
+msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:510
-msgid "Week"
-msgstr "аж"
-
-#: calendar/gui/calendar-commands.c:510
-msgid "Show 1 week"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:513
-msgid "Month"
+#. 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
+msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:513
-msgid "Show 1 month"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:517
-msgid "Year"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:517
-msgid "Show 1 year"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:661
-msgid "Create a new appointment"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:531 calendar/gui/calendar-commands.c:653
-msgid "Print this calendar"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:535
-msgid "Prev"
-msgstr "юлюЭ"
-
-#: calendar/gui/calendar-commands.c:535
-msgid "Go back in time"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:536
-msgid "Today"
-msgstr "©ю╢ц"
-
-#: calendar/gui/calendar-commands.c:536
-msgid "Go to present time"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:537
-msgid "Next"
-msgstr "╢ыю╫"
-
-#: calendar/gui/calendar-commands.c:537
-msgid "Go forward in time"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:541
-msgid "Go to"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:541
-msgid "Go to a specific date"
-msgstr "юсюгюг Ё╞╥н ╟║╠Б"
-
-#. file menu
-#: calendar/gui/calendar-commands.c:638
-msgid "New Ca_lendar"
-msgstr "╩У ╢ч╥б(_l)"
-
-#: calendar/gui/calendar-commands.c:639
-msgid "Create a new calendar"
-msgstr "╩У ╢ч╥бю╩ ╦╦╣Л╢о╢ы"
-
-#: calendar/gui/calendar-commands.c:642
-msgid "Open Ca_lendar"
-msgstr "╢ч╥б ©╜╠Б(_l)"
-
-#: calendar/gui/calendar-commands.c:643
-msgid "Open a calendar"
-msgstr "╢ч╥бю╩ ©╠╢о╢ы"
-
-#: calendar/gui/calendar-commands.c:647 calendar/gui/calendar-commands.c:648
-msgid "Save Calendar As"
-msgstr "╢ч╥б юЗюЕ"
-
-#: calendar/gui/calendar-commands.c:661
-msgid "_New appointment..."
-msgstr "╩У ╬Ю╪с(_N)"
-
-#: calendar/gui/calendar-commands.c:669 calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:676 calendar/gui/calendar-commands.c:677
-msgid "About Calendar"
-msgstr ""
-
-#. i18n: This "%s%s" indicates possession. Languages where the order is
-#. * the inverse should translate it to "%2$s%1$s".
-#.
-#: calendar/gui/calendar-commands.c:719
-#, c-format
-msgid "%s%s"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:719
-msgid "'s calendar"
-msgstr ""
-
-#: calendar/gui/calendar-model.c:327
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:330
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:333
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
 msgid "Unknown"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:441
 msgid "N"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:441
 msgid "S"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:443
 msgid "E"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:443
 msgid "W"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:515
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:518
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1589,22 +1335,51 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:916
+#. strptime format for a date.
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+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
+msgid "%I:%M:%S %p%n"
+msgstr ""
+
+#. strptime format for a time of day, in 24-hour format.
+#: calendar/gui/calendar-model.c:866
+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
+msgid "%I:%M %p%n"
+msgstr ""
+
+#. strptime format for time of day, without seconds 24-hour format.
+#: calendar/gui/calendar-model.c:873
+msgid "%H:%M%n"
+msgstr ""
+
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:956
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:990
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr ""
 
-#: calendar/gui/control-factory.c:124
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "╢ч╥бюл г╔╫цгр URI"
 
@@ -1621,618 +1396,686 @@ msgid "No summary available."
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/event-editor.c:1354
+#: 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
 msgid "Close"
 msgstr "╢щ╠Б"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1150
-msgid "Snooze"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "╬Ю╪сю╩ ╪Жа╓го╠Б"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr ""
+
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:245
-msgid "FIXME: _Delete"
-msgstr "╟Мд╔©╧а╓: ╩Ха╕(_D)"
+#.
+#. * 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
+msgid "05 minutes"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:287
-#: calendar/gui/dialogs/task-editor.c:295
-msgid "FIXME: In_complete Task"
-msgstr "╟Мд╔©╧а╓: ╨р©оюЭгя еб╫╨е╘(_c)"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:347 calendar/gui/event-editor.c:1287
-msgid "FIXME: Chec_k Names"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:348 calendar/gui/event-editor.c:1288
-msgid "FIXME: Address _Book..."
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:355
-msgid "FIXME: _New Task"
-msgstr "╟Мд╔©╧а╓: ╩У еб╫╨е╘(_N)"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:357
-msgid "FIXME: S_end Status Report"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:358
-msgid "FIXME: _Mark Complete"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:360 calendar/gui/event-editor.c:1297
-msgid "FIXME: Rec_urrence..."
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:361
-msgid "FIXME: S_kip Occurrence"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:363
-msgid "FIXME: Assig_n Task"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:365
-msgid "FIXME: _Reply"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Calendar"
+msgstr "╩У ╢ч╥б(_l)"
+
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:366
-msgid "FIXME: Reply to A_ll"
-msgstr "╟Мд╔©╧а╓: ╦П╣н ╢ДюЕ"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:409
-msgid "FIXME: Save and Close"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:410
-msgid "Save the task and close the dialog box"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:414 calendar/gui/event-editor.c:1361
-msgid "FIXME: Print..."
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:419
-msgid "FIXME: Recurrence..."
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:420
-msgid "Configure recurrence rules"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:422
-msgid "FIXME: Assign Task..."
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:423
-msgid "Assign the task to someone"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:425
-msgid "FIXME: Delete"
-msgstr "╟Мд╔©╧а╓: ╩Ха╕"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+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.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "S_ubject:"
-msgstr "а╕╦Я(_u):"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "╠щ"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "Owner:"
-msgstr "╪рю╞юз:"
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Friday"
+msgstr "╠щ©Дюо"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
-msgstr "╫цюш Ё╞б╔(_r):"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+#, fuzzy
+msgid "Highlight"
+msgstr "ЁТюл:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-msgid "_Status:"
-msgstr "╩Себ(_S):"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid ""
-"Not Started\n"
-"In Progress\n"
-"Completed\n"
-"Cancelled\n"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "Not Started"
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-msgid "_Priority:"
-msgstr "©Л╪╠╪Ью╖(_P):"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "©Ы"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid ""
-"High\n"
-"Normal\n"
-"Low\n"
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "©Ы©Дюо"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
-msgid "High"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
-msgid "% Comp_lete:"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
-msgid "_Contacts..."
-msgstr "©╛╤ТцЁ(_C)..."
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "©Л╪╠╪Ью╖"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
-msgid "Task"
-msgstr "юш╬В"
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
-msgid "Location:"
-msgstr "ю╖д║:"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "еД"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
-msgid "URL:"
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Saturday"
+msgstr "еД©Дюо"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:32
-msgid "Resources:"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "╬Ю╪с - %s"
+
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
 msgstr ""
 
-#. Create the header columns
-#: calendar/gui/e-calendar-table.c:196
-msgid "Categories"
-msgstr "╦Я╥о"
+#: po/tmp/cal-prefs-dialog.glade.h:47
+#, fuzzy
+msgid "Start of day:"
+msgstr "╫цюш Ё╞б╔(_r):"
 
-#: calendar/gui/e-calendar-table.c:197
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "╨п╥Ы"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "юо"
 
-#: calendar/gui/e-calendar-table.c:198
-msgid "Completion date"
-msgstr "©о╥Аюо"
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "юо©Дюо"
 
-#: calendar/gui/e-calendar-table.c:199
-msgid "End date"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:50
+#, fuzzy
+msgid "TaskPad"
+msgstr "юш╬В"
 
-#: calendar/gui/e-calendar-table.c:200
-msgid "Start date"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "╦Я"
+
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+#, fuzzy
+msgid "Thursday"
+msgstr "╦Я©Дюо"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:201
-msgid "Due date"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:202
-msgid "Geographical position"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:203
-msgid "Percent complete"
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "х╜"
+
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+#, fuzzy
+msgid "Tuesday"
+msgstr "х╜©Дюо"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
-#: mail/message-list.c:508
-msgid "Priority"
-msgstr "©Л╪╠╪Ью╖"
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "╪Ж"
+
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+#, fuzzy
+msgid "Wednesday"
+msgstr "╪Ж©Дюо"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
+#, fuzzy
+msgid "Work week"
+msgstr "аж"
 
-#: calendar/gui/e-calendar-table.c:212
-msgid "Summary"
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:216
-msgid "Transparency"
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:217
-msgid "URL"
+#.
+#. * 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
+msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:219 calendar/gui/prop.c:786
-msgid "Alarms"
+#: po/tmp/task-editor-dialog.glade.h:7
+#, fuzzy
+msgid "C_lassification:"
+msgstr "╨п╥Ы"
+
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:317
-msgid "Open..."
-msgstr "©╜╠Б..."
+#: po/tmp/task-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Completed"
+msgstr "©о╥Аюо"
 
-#: calendar/gui/e-calendar-table.c:318
-msgid "Open the task"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:320
-msgid "Mark Complete"
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:321
-msgid "Mark the task complete"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:324
-msgid "Delete the task"
-msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
+#: po/tmp/task-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Low"
+msgstr "аЖ╠щ"
 
-#: calendar/gui/e-day-view-time-item.c:393
-#, c-format
-msgid "%02i minute divisions"
+#. 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
+msgid "None"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2510 calendar/gui/e-day-view.c:2517
-#: calendar/gui/e-day-view.c:2526 calendar/gui/e-week-view.c:2944
-#: calendar/gui/e-week-view.c:2951 calendar/gui/e-week-view.c:2960
-msgid "New appointment..."
-msgstr "╩У ╬Ю╪с"
+#: po/tmp/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Normal"
+msgstr "гЭ╫д"
 
-#: calendar/gui/e-day-view.c:2514 calendar/gui/e-day-view.c:2521
-#: calendar/gui/e-week-view.c:2948 calendar/gui/e-week-view.c:2955
-msgid "Edit this appointment..."
-msgstr "гЖюГ ╬Ю╪сю╩ ╪Жа╓гу╢о╢ы..."
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:2515 calendar/gui/e-week-view.c:2949
-#: calendar/gui/event-editor.c:1350
-msgid "Delete this appointment"
-msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:2522 calendar/gui/e-week-view.c:2956
-msgid "Make this appointment movable"
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr "╫цюш Ё╞б╔(_r):"
+
+#: po/tmp/task-editor-dialog.glade.h:24
+msgid "Task"
+msgstr "юш╬В"
+
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2523 calendar/gui/e-week-view.c:2957
-msgid "Delete this occurrence"
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "©╛╤ТцЁ(_C)..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2524 calendar/gui/e-week-view.c:2958
-msgid "Delete all occurrences"
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "©Л╪╠╪Ью╖(_P):"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "╩Себ(_S):"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor.c:276
-msgid "Edit Appointment"
-msgstr "╬Ю╪сю╩ ╪Жа╓гя╢ы"
+#: calendar/gui/dialogs/task-editor.c:681
+#, fuzzy
+msgid "Edit Task"
+msgstr "юш╬В"
 
-#: calendar/gui/event-editor.c:282
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/event-editor.c:288
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
 #, c-format
 msgid "Appointment - %s"
 msgstr "╬Ю╪с - %s"
 
-#: calendar/gui/event-editor.c:291
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/event-editor.c:294
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
 #, c-format
 msgid "Journal entry - %s"
 msgstr "©╘гЮ юоа╓ - %s"
 
-#: calendar/gui/event-editor.c:1252
-msgid "FIXME: Ca_lendar..."
-msgstr ""
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#, fuzzy
+msgid "Do you want to save changes?"
+msgstr "╦ч╪╪аЖ╥н ╨╞╟Ф╩Ггвю╩ юЗюЕгр╥а╟М гт..."
 
-#: calendar/gui/event-editor.c:1295
-msgid "FIXME: _New Appointment"
-msgstr "╟Мд╔©╧а╓: ╩У ╬Ю╪с(_N)"
+#: calendar/gui/e-calendar-table.c:336
+msgid "Open..."
+msgstr "©╜╠Б..."
 
-#: calendar/gui/event-editor.c:1299
-msgid "FIXME: Invite _Attendees..."
+#: calendar/gui/e-calendar-table.c:337
+msgid "Open the task"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1300
-msgid "FIXME: C_ancel Invitation..."
+#: calendar/gui/e-calendar-table.c:339
+msgid "Mark Complete"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1302
-msgid "FIXME: Forward as v_Calendar"
+#: calendar/gui/e-calendar-table.c:340
+msgid "Mark the task complete"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1344 mail/folder-browser.c:380
-msgid "Save"
-msgstr "юЗюЕ"
-
-#: calendar/gui/event-editor.c:1345
-msgid "Save this appointment"
-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/event-editor.c:1355
-msgid "Close this appointment"
-msgstr "юл ╬Ю╪сю╩ ╢щ╫ю╢о╢ы"
+#: calendar/gui/e-calendar-table.c:343
+msgid "Delete the task"
+msgstr "юл юоа╓╦╕ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/event-editor.c:1371
-msgid "FIXME: Invite Attendees..."
+#: calendar/gui/e-day-view-time-item.c:516
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1372
-msgid "Invite attendees to a meeting"
+#. 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-week-view-main-item.c:325
+msgid "%A %d %B"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1911
-msgid "%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-week-view-main-item.c:334
+msgid "%a %d %b"
 msgstr ""
 
-#. todo
-#.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
+#. 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-week-view-main-item.c:348
+msgid "%d %b"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
-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
+msgid "New appointment..."
+msgstr "╩У ╬Ю╪с"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-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
+msgid "Edit this appointment..."
+msgstr "гЖюГ ╬Ю╪сю╩ ╪Жа╓гу╢о╢ы..."
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Start time:"
-msgstr ""
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
+msgid "Delete this appointment"
+msgstr "юл ╬Ю╪сю╩ ╩Ха╕гу╢о╢ы"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "End time:"
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+msgid "Delete all occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
+#.
+#. * 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
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "╬Ю╪с"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Display"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "╨п╥Ы"
+
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
+#: po/tmp/event-editor-dialog.glade.h:11
+#, fuzzy
+msgid "Days"
+msgstr "╢Е╩У╬© ╨╦юл╠Б"
+
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Program"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Mail"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
+#: po/tmp/event-editor-dialog.glade.h:17
 msgid "Mail _to:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "_Run program:"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "Reminder"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Modify"
+msgstr "©Ы©Дюо"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "Recurrence rule"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:937
-msgid "None"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "╧л╦╝╨╦╠Б:"
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Daily"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Weekly"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Monthly"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Yearly"
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "label23"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-#: calendar/gui/event-editor-dialog.glade.h:51
-#: calendar/gui/event-editor-dialog.glade.h:81
-msgid "Every "
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "day(s)"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "label24"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "week(s)"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "©Ы"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "х╜"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "╪Ж"
+#: po/tmp/event-editor-dialog.glade.h:33
+#, fuzzy
+msgid "_End time:"
+msgstr "х╦юг а╬╥А ╫ц╟ё(_e):"
 
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "╦Я"
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "╠щ"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "еД"
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "юо"
+#: po/tmp/event-editor-dialog.glade.h:37
+#, fuzzy
+msgid "_Start time:"
+msgstr "╫цюш Ё╞б╔(_r):"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "label25"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:38
+#, fuzzy
+msgid "_Starting date:"
+msgstr "╫цюш Ё╞б╔(_r):"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Recur on the"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "th day of the month"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Every"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:79
+#: po/tmp/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:82
-msgid "year(s)"
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "label27"
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:84
-msgid "Ending date"
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Repeat forever"
-msgstr ""
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "╬Ю╪сю╩ ╪Жа╓гя╢ы"
+
+#: calendar/gui/event-editor.c:407
+#, fuzzy
+msgid "on"
+msgstr "©Ы"
 
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "End on "
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "End after"
+#: calendar/gui/event-editor.c:559
+msgid "on the"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "occurrence(s)"
+#: calendar/gui/event-editor.c:566
+msgid "th"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "Exceptions"
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:91
-msgid "Change"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "Recurrence"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -2331,11 +2174,11 @@ msgstr "╠щ©Дюо"
 msgid "saturday"
 msgstr "еД©Дюо"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr ""
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr ""
 
@@ -2343,19 +2186,15 @@ msgstr ""
 msgid "fortnight"
 msgstr ""
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr ""
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr ""
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr ""
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr ""
 
@@ -2363,7 +2202,7 @@ msgstr ""
 msgid "min"
 msgstr ""
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr ""
 
@@ -2383,8 +2222,8 @@ msgstr "╬На╕"
 msgid "today"
 msgstr "©ю╢ц"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "аЖ╠щ"
 
@@ -2449,37 +2288,29 @@ msgstr ""
 msgid "ago"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:138
-msgid "Create to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:138
-msgid "Edit to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:174
-msgid "Summary:"
+#: 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/gncal-todo.c:185
-msgid "Due Date:"
+#: calendar/gui/gnome-cal.c:1152
+#, c-format
+msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:196
-msgid "Priority:"
-msgstr "©Л╪╠╪Ью╖:"
-
-#: calendar/gui/gncal-todo.c:214
-msgid "Item Comments:"
-msgstr ""
+#: calendar/gui/gnome-cal.c:1163
+#, fuzzy, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "╩У ╢ч╥бю╩ ╦╦╣Л╢о╢ы"
 
-#: calendar/gui/gnome-cal.c:559 calendar/gui/gnome-cal.c:1158
-#: calendar/gui/gnome-cal.c:1214
-msgid "Reminder of your appointment at "
+#: 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:1163 calendar/gui/gnome-cal.c:1218
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "х╝юн"
 
@@ -2487,19 +2318,19 @@ msgstr "х╝юн"
 msgid "Year:"
 msgstr ""
 
-#: calendar/gui/goto.c:264
+#: calendar/gui/goto.c:270
 msgid "Go to date"
 msgstr ""
 
 #. Instructions
-#: calendar/gui/goto.c:275
+#: 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:312
+#: calendar/gui/goto.c:318
 msgid "Go to today"
 msgstr ""
 
@@ -2627,613 +2458,1105 @@ msgstr ""
 msgid "31st"
 msgstr ""
 
-#: calendar/gui/print.c:349
+#: calendar/gui/print.c:350
 msgid "Su"
 msgstr ""
 
-#: calendar/gui/print.c:349
+#: calendar/gui/print.c:350
 msgid "Mo"
 msgstr ""
 
-#: calendar/gui/print.c:349
+#: calendar/gui/print.c:350
 msgid "Tu"
 msgstr ""
 
-#: calendar/gui/print.c:349
+#: calendar/gui/print.c:350
 msgid "We"
 msgstr ""
 
-#: calendar/gui/print.c:349
+#: calendar/gui/print.c:350
 msgid "Th"
 msgstr ""
 
-#: calendar/gui/print.c:349
+#: calendar/gui/print.c:350
 msgid "Fr"
 msgstr ""
 
-#: calendar/gui/print.c:349
+#: calendar/gui/print.c:350
 msgid "Sa"
 msgstr ""
 
-#: calendar/gui/print.c:937
-msgid "TODO Items"
-msgstr ""
+#: calendar/gui/print.c:936
+#, fuzzy
+msgid "Tasks"
+msgstr "юш╬В"
 
 #. Day
-#: calendar/gui/print.c:1038
+#: calendar/gui/print.c:1066
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1058 calendar/gui/print.c:1072
-#: calendar/gui/print.c:1073
-msgid "%a"
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1059 calendar/gui/print.c:1060
-#: calendar/gui/print.c:1074 calendar/gui/print.c:1075
-msgid "%b"
+#: calendar/gui/print.c:1081
+msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1062
+#: calendar/gui/print.c:1092
 #, c-format
-msgid "Current week (%s %s %d - %s %d %d)"
-msgstr ""
-
-#: calendar/gui/print.c:1079
-#, c-format
-msgid "Current week (%s %s %d - %s %s %d %d)"
-msgstr ""
-
-#: calendar/gui/print.c:1085
-#, c-format
-msgid "Current week (%s %s %d %d - %s %s %d %d)"
+msgid "Current week (%s - %s)"
 msgstr ""
 
 #. Month
-#: calendar/gui/print.c:1098
-msgid "Current month (%a %Y)"
+#: calendar/gui/print.c:1100
+msgid "Current month (%b %Y)"
 msgstr ""
 
 #. Year
-#: calendar/gui/print.c:1105
+#: calendar/gui/print.c:1107
 msgid "Current year (%Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1142
+#: calendar/gui/print.c:1144
 msgid "Print Calendar"
 msgstr ""
 
-#: calendar/gui/print.c:1307
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "юн╪Б ╧л╦╝╨╦╠Б"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
+#. 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 ""
 
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+msgid "SMTWTFS"
 msgstr ""
 
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, fuzzy, c-format
+msgid "Could not create lock file for %s: %s"
 msgstr ""
+"╦М╫ц╣х фЗ╢У╦╕ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы:\n"
+"%s"
 
-#: calendar/gui/prop.c:342
-msgid "24-hour"
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "юо©Дюо"
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
 
-#: calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "©Ы©Дюо"
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:146
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:156
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr ""
 
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
+#: camel/camel-movemail.c:197
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:243
+#, fuzzy, c-format
+msgid "Error reading mail file: %s"
+msgstr "фдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
+
+#: camel/camel-movemail.c:254
+#, fuzzy, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "фдюо юЗюЕаъ ©ю╥Ы ╧ъ╩Щ: %s"
+
+#: camel/camel-movemail.c:272
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:304
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:316
+#, c-format
+msgid "Could not fork: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:354
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:355
+#, fuzzy
+msgid "(Unknown error)"
+msgstr "©║╥╞ ╬Ью╫"
+
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
+msgstr ""
+
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
 msgstr ""
 
-#: calendar/gui/prop.c:375
+#: camel/camel-remote-store.c:182
+#, fuzzy, c-format
+msgid "%s server %s"
+msgstr "╢╨╫╨ ╪╜╧Ж"
+
+#: camel/camel-remote-store.c:186
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:227
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:228
+msgid "(unknown host)"
+msgstr ""
+
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr ""
+
+#: camel/camel-service.c:129
+#, c-format
+msgid "URL '%s' needs a host component"
+msgstr ""
+
+#: camel/camel-service.c:138
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr ""
+
+#: camel/camel-service.c:488
+#, c-format
+msgid "No such host %s."
+msgstr ""
+
+#: camel/camel-service.c:491
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr ""
+
+#: camel/camel-session.c:272
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
+#: camel/camel-session.c:360
+#, c-format
 msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
+"Could not create directory %s:\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/prop.c:391
-msgid "Day start:"
+#: camel/camel-url.c:78
+#, c-format
+msgid "URL string `%s' contains no protocol"
 msgstr ""
 
-#: calendar/gui/prop.c:402
-msgid "Day end:"
+#: camel/camel-url.c:93
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
 msgstr ""
 
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
+#: camel/camel-url.c:154
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
 msgstr ""
 
-#: calendar/gui/prop.c:528
-msgid "Colors"
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
 msgstr ""
 
-#: calendar/gui/prop.c:610
-msgid "Due Date"
+#: camel/providers/imap/camel-imap-command.c:216
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:612
-msgid "Time Until Due"
+#: camel/providers/imap/camel-imap-command.c:224
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+msgid "Unknown error"
 msgstr ""
 
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
 msgstr ""
 
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
+#: camel/providers/imap/camel-imap-command.c:407
+#, c-format
+msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
+#: camel/providers/imap/camel-imap-command.c:443
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
+#: camel/providers/imap/camel-imap-folder.c:216
+#, c-format
+msgid "Could not load summary for %s"
 msgstr ""
 
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
+#: camel/providers/imap/camel-imap-folder.c:586
+msgid "Could not find message body in FETCH response."
 msgstr ""
 
-#: calendar/gui/prop.c:687
-msgid "To Do List"
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
 msgstr ""
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
+#: camel/providers/imap/camel-imap-provider.c:41
+msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
+#: 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 ""
 
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
+#: camel/providers/imap/camel-imap-store.c:236
+msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
 msgstr ""
 
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/prop.c:842
-msgid "Defaults"
+#: camel/providers/imap/camel-imap-store.c:333
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:182
-msgid "Cut"
-msgstr "юз╦ё╠Б"
+#: camel/providers/imap/camel-imap-store.c:359
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:183
-msgid "Cut selected item into clipboard"
-msgstr "╪╠ецгя гв╦Яю╩ е╛╦Ё╨╦╣Е╥н юз╦╗╢о╢ы"
+#: camel/providers/imap/camel-imap-store.c:539
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:186
-#: mail/folder-browser-factory.c:46
-msgid "Copy"
-msgstr "╨╧╩Г"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:187
-msgid "Copy selected item into clipboard"
-msgstr "╪╠ецгя гв╦Яю╩ е╛╦Ё╨╦╣Е╥н ╨╧╩Ггу╢о╢ы"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:190
-#: composer/e-msg-composer-address-dialog.c:198
-msgid "Paste"
-msgstr "╨ыюл╠Б"
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199
-msgid "Paste item from clipboard"
-msgstr "е╛╦Ё╨╦╣Е©║╪╜ гв╦Яю╩ ╨╧╩Ггу╢о╢ы"
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:525
-msgid "Select recipients' addresses"
-msgstr "╧чю╩ ╩Г╤Вюг аж╪р ╪╠ец"
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+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.
-#.
-#: composer/e-msg-composer-address-dialog.glade.h:7
-msgid "Recipient list:"
-msgstr "╧ч╢б╩Г╤В ╦Я╥о:"
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:9
-msgid "Search..."
-msgstr "╟к╩Ж..."
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:10
-msgid "Name"
-msgstr "юл╦╖"
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:11
-#: mail/mail-config.glade.h:8
-msgid "Address"
-msgstr "аж╪р"
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr ""
+"╦М╫ц╣х фЗ╢У╦╕ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы:\n"
+"%s"
 
-#: composer/e-msg-composer-address-dialog.glade.h:12
-msgid "Properties..."
-msgstr "╪Ёа╓..."
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "цъ╟║..."
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
+#, fuzzy, c-format
+msgid "Local mail file %s"
+msgstr "фдюо юЗюЕаъ ©ю╥Ы ╧ъ╩Щ: %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr "╫ц╫╨еш юЗюЕюЕд║╦╕ аЖа╓гр╪Ж ╬Ь╫ю╢о╢ы -- %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
+#, fuzzy, c-format
+msgid "Folder `%s' does not exist."
+msgstr "╠в фдюою╨ а╦юГгоаЖ╬й╫ю╢о╢ы"
+
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, fuzzy, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"╦М╫ц╣х фЗ╢У╦╕ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"╦М╫ц╣х фЗ╢У╦╕ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:117
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:160
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:234
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:341
+#, 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
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:491
+#, 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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:562
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:579
+#, 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
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:604
+#, fuzzy, c-format
+msgid "Could not close temp folder: %s"
+msgstr ""
+"╦М╫ц╣х фЗ╢У╦╕ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы:\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-summary.c:615
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:817
+#, c-format
+msgid "Unknown error: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н ╨╧╩Ггу╢о╢ы"
+
+#: camel/providers/local/camel-mh-store.c:116
+#, c-format
+msgid "`%s' is not a directory."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: 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:144
+#, 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 "gnomecal ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:179
+msgid "Could not open folder: message listing was incomplete."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:273
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:150
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:160
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:172
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:217
+#, fuzzy, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr "gnomecal ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#: camel/providers/pop3/camel-pop3-store.c:335
+#, c-format
+msgid "Could not connect to POP server on %s."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:389
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending username: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:14
-msgid "To: >>"
-msgstr "╧ч╢б╩Г╤В: >>"
+#: camel/providers/pop3/camel-pop3-store.c:411
+#: camel/providers/pop3/camel-pop3-store.c:448
+msgid "(Unknown)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:438
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:446
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:555
+#, c-format
+msgid "No such folder `%s'."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#, fuzzy
+msgid "Sendmail"
+msgstr "╨╦Ё©"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:15
-msgid "Cc: >>"
-msgstr "бЭа╤: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:16
-msgid "Bcc: >>"
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:17
-msgid "label9"
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, fuzzy, c-format
+msgid "Could not send message: %s"
+msgstr "юЭ╢ч╣х ╦ч╫цаЖ - %s"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:18
-msgid "label7"
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:19
-msgid "label8"
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:76
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#, fuzzy
+msgid "sendmail"
+msgstr "фМаЖ ╧ч╠Б"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:30
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 ╧ыюлф╝"
 
-#: composer/e-msg-composer-attachment-bar.c:78
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u ╧ыюлф╝"
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:93
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:299
-msgid "Add attachment"
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#, fuzzy
+msgid "attachment"
 msgstr "ц╥╨нфдюо цъ╟║"
 
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/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
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "а╕╟е"
 
-#: composer/e-msg-composer-attachment-bar.c:363
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "ц╥╨нфдюо ╦Я╥о©║╪╜ ╪╠ецгя гв╦Яю╩ а╕╟егу╢о╢ы"
 
-#: composer/e-msg-composer-attachment-bar.c:394
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "ц╥╨нфдюо цъ╟║..."
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "ц╥╨н ╪с╪╨"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "MIME гЭ╫д:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "фдюо юл╦╖:"
 
-#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
+#: po/tmp/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
 msgid "From:"
 msgstr "╨╦Ё╫юл:"
 
-#: composer/e-msg-composer-hdrs.c:244
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "аж╪р╥о"
 
-#: composer/e-msg-composer-hdrs.c:297
-msgid "Enter the identitiy you wish to send this message from"
-msgstr ""
+#: composer/e-msg-composer-hdrs.c:291
+#, fuzzy
+msgid "Enter the identity you wish to send this message from"
+msgstr "╦ч╪╪аЖ╦╕ ╧чю╩╩Г╤Вю╩ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "╧ч╢б╩Г╤В:"
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "╦ч╪╪аЖ╦╕ ╧чю╩╩Г╤Вю╩ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "бЭа╤:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "╦ч╪╪аЖюг ╩Г╨╩ю╩ ╧чю╩ ╩Г╤Вюг аж╪р╦╕ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:313
+#: composer/e-msg-composer-hdrs.c:307
 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:319
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "а╕╦Я:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "фМаЖюг а╕╦Яю╩ ют╥бго╪╪©Д"
 
-#: composer/e-msg-composer.c:466
+#: composer/e-msg-composer.c:429
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "юЗюЕ..."
 
-#: composer/e-msg-composer.c:477
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "фдюо юЗюЕаъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:497
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "фдюою╩ юп╢баъ ©ю╥Ы ╧ъ╩Щ: %s"
 
-#: composer/e-msg-composer.c:519
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "╦ч╪╪аЖ╥н ╨╞╟Ф╩Ггвю╩ юЗа╓аъ..."
 
-#: composer/e-msg-composer.c:521
-msgid "About to save changes to message..."
-msgstr "╦ч╪╪аЖ╥н ╨╞╟Ф╩Ггвю╩ юЗюЕгр╥а╟М гт..."
+#: composer/e-msg-composer.c:654
+#, fuzzy
+msgid "Save changes to message..."
+msgstr "╦ч╪╪аЖ╥н ╨╞╟Ф╩Ггвю╩ юЗа╓аъ..."
+
+#: composer/e-msg-composer.c:695
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
 
-#: composer/e-msg-composer.c:606 shell/e-shell-view-menu.c:165
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr ""
 
-#: composer/e-msg-composer.c:612
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:634
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr ""
 
-#: composer/e-msg-composer.c:746
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "╠в фдюою╨ а╦юГгоаЖ╬й╫ю╢о╢ы"
 
-#: composer/e-msg-composer.c:756
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr ""
 
-#: composer/e-msg-composer.c:766
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:776
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:798
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:819
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr ""
 
-#: composer/e-msg-composer.c:915 shell/e-shell-view-menu.c:434
-msgid "_File"
-msgstr "фдюо(_F)"
-
-#: composer/e-msg-composer.c:921
-msgid "_Open..."
-msgstr "©╜╠Б(_O)..."
-
-#: composer/e-msg-composer.c:922
-msgid "Load a previously saved message"
-msgstr ""
-
-#: composer/e-msg-composer.c:930
-msgid "_Save..."
-msgstr "юЗюЕ(_S)..."
-
-#: composer/e-msg-composer.c:931
-msgid "Save message"
-msgstr "╦ч╪╪аЖ╦╕ юЗюЕгу╢о╢ы"
-
-#: composer/e-msg-composer.c:939
-msgid "_Save as..."
-msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ(_S)..."
-
-#: composer/e-msg-composer.c:940
-msgid "Save message with a different name"
-msgstr ""
-
-#: composer/e-msg-composer.c:948
-msgid "Save in _folder..."
-msgstr "фЗ╢У╥н юЗюЕ(_f)..."
-
-#: composer/e-msg-composer.c:949
-msgid "Save the message in a specified folder"
-msgstr "╦ч╪╪аЖ╦╕ аЖа╓гя фЗ╢У╥н юЗюЕгу╢о╢ы"
-
-#: composer/e-msg-composer.c:958
-msgid "_Insert text file... (FIXME)"
-msgstr ""
-
-#: composer/e-msg-composer.c:959
-msgid "Insert a file as text into the message"
-msgstr ""
-
-#: composer/e-msg-composer.c:968
-msgid "_Send"
-msgstr "╨╦Ё©(_S)"
-
-#: composer/e-msg-composer.c:969
-msgid "Send the message"
-msgstr "╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
-
-#: composer/e-msg-composer.c:979
-msgid "_Close..."
-msgstr "╢щ╠Б(_C)..."
-
-#: composer/e-msg-composer.c:980
-msgid "Quit the message composer"
-msgstr ""
-
-#: composer/e-msg-composer.c:993 shell/e-shell-view-menu.c:478
-msgid "_Edit"
-msgstr "╪Жа╓(_E)..."
-
-#: composer/e-msg-composer.c:1004
-msgid "_Format"
-msgstr "гЭ╫д(_F)"
-
-#: composer/e-msg-composer.c:1010
-msgid "HTML"
-msgstr ""
-
-#: composer/e-msg-composer.c:1011
-msgid "Send the mail in HTML format"
-msgstr ""
+#: composer/e-msg-composer.c:1343
+msgid "Compose a message"
+msgstr "╦чюо ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
 
-#: composer/e-msg-composer.c:1024 shell/e-shell-view-menu.c:383
-#: shell/e-shell-view-menu.c:489 shell/e-storage-set-view.c:221
-msgid "_View"
+#: composer/e-msg-composer.c:1420
+msgid "Could not create composer window."
 msgstr ""
 
-#: composer/e-msg-composer.c:1030
-msgid "Show _attachments"
-msgstr "ц╥╨н╧╟ ╨╦╠Б(_a)"
-
-#: composer/e-msg-composer.c:1031
-msgid "Show/hide attachments"
-msgstr "ц╥╨н╧╟ю╩ ╨╦╟еЁ╙ ╪Ш╠И╢о╢ы"
-
-#: composer/e-msg-composer.c:1064
-msgid "Send"
-msgstr "╨╦Ё©"
-
-#: composer/e-msg-composer.c:1065
-msgid "Send this message"
-msgstr "юл ╦ч╪╪аЖ╦╕ ╨╦Ё©"
-
-#: composer/e-msg-composer.c:1074
-msgid "Attach"
-msgstr "ц╥╨н"
-
-#: composer/e-msg-composer.c:1075
-msgid "Attach a file"
-msgstr "фдюою╩ ц╥╨нгу╢о╢ы"
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "Evolution ╫╘ю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: composer/e-msg-composer.c:1262
-msgid "Compose a message"
-msgstr "╦чюо ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "╟к╩Ж"
 
-#: filter/filter-datespec.c:61
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "©╛╣╣"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr ""
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr ""
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 msgid "days"
 msgstr ""
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr ""
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr ""
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3241,348 +3564,724 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr ""
 
-#: filter/filter-editor.c:156 filter/score-editor.c:126
-#: filter/vfolder-editor.c:152
-msgid "Add Rule"
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
+msgid "Add Filter Rule"
+msgstr ""
+
+#: filter/filter-editor.c:233
+msgid "Edit Filter Rule"
 msgstr ""
 
-#: filter/filter-editor.c:188
-msgid "Edit Rule"
+#: filter/filter-editor.c:433
+msgid "incoming"
 msgstr ""
 
-#: filter/filter-filter.c:397 filter/filter-rule.c:536
-msgid "Less"
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr "╧╜╠Б"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#, fuzzy
+msgid "Edit Filters"
+msgstr "гйем"
+
+#. and now for the action area
+#: filter/filter-filter.c:401
+msgid "Then"
 msgstr ""
 
-#: filter/filter-filter.c:400 filter/filter-rule.c:539
-msgid "More"
+#: filter/filter-filter.c:414
+#, fuzzy
+msgid "Add action"
+msgstr "гЮ╣©(_n)"
+
+#: filter/filter-filter.c:420
+#, fuzzy
+msgid "Remove action"
+msgstr "а╕╟е"
+
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:185 filter/vfolder-rule.c:269
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "фЗ╢У ╪╠ец"
 
-#: filter/filter-folder.c:207
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:249
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr ""
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:184
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr ""
 
-#: filter/score-editor.c:160
-msgid "Edit Score Rule"
+#: filter/filter-rule.c:520
+#, fuzzy
+msgid "Rule name: "
+msgstr "фдюо юл╦╖:"
+
+#: filter/filter-rule.c:524
+#, fuzzy
+msgid "Untitled"
+msgstr "(а╕╦Я╬Ью╫)"
+
+#: filter/filter-rule.c:540
+msgid "If"
 msgstr ""
 
-#: filter/vfolder-editor.c:186
-msgid "Edit VFolder Rule"
+#: filter/filter-rule.c:557
+msgid "Execute actions"
 msgstr ""
 
-#: mail/component-factory.c:187
-msgid "Cannot initialize Evolution's mail component."
+#: filter/filter-rule.c:561
+msgid "if all criteria are met"
 msgstr ""
 
-#: mail/folder-browser-factory.c:33
-msgid "Get mail"
-msgstr "фМаЖ ╧ч╠Б"
+#: filter/filter-rule.c:566
+msgid "if any criteria are met"
+msgstr ""
 
-#: mail/folder-browser-factory.c:33
-msgid "Check for new mail"
-msgstr "╩У фМаЖ╦╕ х╝юнгу╢о╢ы"
+#: filter/filter-rule.c:577
+msgid "Add criterion"
+msgstr ""
 
-#: mail/folder-browser-factory.c:34
-msgid "Compose"
+#: filter/filter-rule.c:583
+msgid "Remove criterion"
 msgstr ""
 
-#: mail/folder-browser-factory.c:34
-msgid "Compose a new message"
-msgstr "╩У ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
+msgid "Edit"
+msgstr "фМаЩ"
 
-#. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
-#. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/folder-browser-factory.c:38 mail/mail-view.c:148
-msgid "Reply"
-msgstr "╢ДюЕ"
+#: po/tmp/filter.glade.h:10
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "фЗ╢У"
 
-#: mail/folder-browser-factory.c:38 mail/mail-view.c:148
-msgid "Reply to the sender of this message"
-msgstr "юл ╦ч╪╪аЖ╦╕ ╨╦Ё╫╩Г╤В©║╟т ╢ДюЕю╩ гу╢о╢ы"
+#: po/tmp/filter.glade.h:11
+#, fuzzy
+msgid "Filter Rules"
+msgstr "гйем"
 
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:151
-msgid "Reply to All"
-msgstr "╦П╣н ╢ДюЕ"
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
 
-#: mail/folder-browser-factory.c:39 mail/mail-view.c:151
-msgid "Reply to all recipients of this message"
-msgstr "юл ╦ч╪╪аЖ╦╕ ╧чю╨ ╦П╣Г ╩Г╤В©║╟т ╢ДюЕю╩ гу╢о╢ы"
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "ю╠╟Ш:"
 
-#: mail/folder-browser-factory.c:41 mail/mail-view.c:154
-msgid "Forward"
-msgstr "юЭ╢ч"
+#: po/tmp/filter.glade.h:15
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "фЗ╢У"
 
-#: mail/folder-browser-factory.c:41 mail/mail-view.c:154
-msgid "Forward this message"
-msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╦╔╩Г╤В©║╟т юЭ╢чгу╢о╢ы"
+#: po/tmp/filter.glade.h:16
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "фЗ╢У"
 
-#: mail/folder-browser-factory.c:45
-msgid "Move"
-msgstr "юл╣©"
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Colour"
+msgstr ""
 
-#: mail/folder-browser-factory.c:45
-msgid "Move message to a new folder"
-msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н юл╣©гу╢о╢ы"
+#: filter/libfilter-i18n.h:3
+msgid "Assign Score"
+msgstr ""
 
-#: mail/folder-browser-factory.c:46
-msgid "Copy message to a new folder"
+#: filter/libfilter-i18n.h:4
+#, fuzzy
+msgid "Copy to Folder"
 msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н ╨╧╩Ггу╢о╢ы"
 
-#: mail/folder-browser-factory.c:48 mail/mail-view.c:158
-msgid "Print the selected message"
-msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Date received"
+msgstr "╧ч╬рю╫"
 
-#: mail/folder-browser-factory.c:50 mail/mail-view.c:160
-msgid "Delete this message"
-msgstr "юл ╦ч╪╪аЖ╦╕ ╩Ха╕гу╢о╢ы"
+#: filter/libfilter-i18n.h:6
+#, fuzzy
+msgid "Date sent"
+msgstr "Ё╞б╔"
 
-#: mail/folder-browser-factory.c:71
-#, c-format
-msgid "Run filter \"%s\""
+#: filter/libfilter-i18n.h:8
+#, fuzzy
+msgid "Expression"
+msgstr "аВ╬В(_P):"
+
+#: filter/libfilter-i18n.h:9
+#, fuzzy
+msgid "Forward to Address"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╦╔╩Г╤В©║╟т юЭ╢чгу╢о╢ы"
+
+#: filter/libfilter-i18n.h:10
+msgid "Message Body"
 msgstr ""
 
-#: mail/folder-browser-factory.c:129 mail/folder-browser-factory.c:187
-msgid "_Print Message"
-msgstr "╦ч╪╪аЖ юн╪Б(_P)"
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
 
-#: mail/folder-browser-factory.c:139
-msgid "_Threaded Message List"
+#: filter/libfilter-i18n.h:12
+#, fuzzy
+msgid "Message was received"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
+
+#: filter/libfilter-i18n.h:13
+#, fuzzy
+msgid "Message was sent"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
+
+#: filter/libfilter-i18n.h:14
+#, fuzzy
+msgid "Move to Folder"
+msgstr "╟Мд╔©╧а╓: фЗ╢У╥н юл╣©(_M)..."
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Recipients"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о:"
+
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
 msgstr ""
 
-#: mail/folder-browser-factory.c:150
-msgid "Mail _Filters..."
-msgstr "фМаЖ гйем(_F)..."
+#: filter/libfilter-i18n.h:18
+#, fuzzy
+msgid "Sender"
+msgstr "╨╦Ё©"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "╩Себ(_S):"
 
-#: mail/folder-browser-factory.c:155
-msgid "_Virtual Folder Editor..."
+#: filter/libfilter-i18n.h:20
+#, fuzzy
+msgid "Source"
+msgstr "а╓╥д"
+
+#: filter/libfilter-i18n.h:21
+msgid "Specific header"
 msgstr ""
 
-#: mail/folder-browser-factory.c:160
-msgid "_Mail Configuration..."
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "╩Себ(_S):"
+
+#: filter/libfilter-i18n.h:23
+msgid "Stop Processing"
 msgstr ""
 
-#: mail/folder-browser-factory.c:165
-msgid "Forget _Passwords"
+#: filter/libfilter-i18n.h:24
+msgid "Subject"
+msgstr "а╕╦Я"
+
+#: filter/libfilter-i18n.h:25
+#, fuzzy
+msgid "after"
+msgstr "Ё╞б╔"
+
+#: filter/libfilter-i18n.h:26
+msgid "before"
 msgstr ""
 
-#: mail/folder-browser-factory.c:173
-msgid "_Message"
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "contains"
+msgstr "гЮ╣©(_n)"
+
+#: filter/libfilter-i18n.h:28
+msgid "does not contain"
 msgstr ""
 
-#: mail/folder-browser-factory.c:177
-msgid "_Open in New Window"
+#: filter/libfilter-i18n.h:29
+msgid "does not end with"
 msgstr ""
 
-#: mail/folder-browser-factory.c:182
-msgid "_Edit Message"
-msgstr "╦ч╪╪аЖ фМаЩ(_E)"
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "does not exist"
+msgstr "╠в фдюою╨ а╦юГгоаЖ╬й╫ю╢о╢ы"
 
-#: mail/folder-browser-factory.c:194
-msgid "Reply to _Sender"
-msgstr "╨╦Ё╫юл©║╟т ╢ДюЕ(_S)"
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "does not sound like"
+msgstr "фдюоюл ╧ъ╟ъ╣гаЖ ╬й╬р╫ю╢о╢ы"
 
-#: mail/folder-browser-factory.c:199
-msgid "Reply to _All"
-msgstr "╦П╣н ╢ДюЕ(_A)"
+#: filter/libfilter-i18n.h:32
+msgid "does not start with"
+msgstr ""
 
-#: mail/folder-browser-factory.c:204
-msgid "_Forward"
-msgstr "юЭ╢ч(_F)"
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
+msgstr ""
 
-#: mail/folder-browser-factory.c:211
-msgid "_Delete Message"
-msgstr "╦ч╪╪аЖ ╩Ха╕(_D)"
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "exists"
+msgstr "╢ыю╫"
 
-#: mail/folder-browser-factory.c:216
-msgid "_Move Message"
-msgstr "╦ч╪╪аЖ юл╣©(_M)"
+#: filter/libfilter-i18n.h:35
+msgid "is greater than"
+msgstr ""
 
-#: mail/folder-browser-factory.c:221
-msgid "_Copy Message"
-msgstr "╦ч╪╪аЖ ╨╧╩Г(_C)"
+#: filter/libfilter-i18n.h:36
+msgid "is less than"
+msgstr ""
 
-#: mail/folder-browser-factory.c:228
-msgid "_VFolder on Subject"
+#: filter/libfilter-i18n.h:37
+msgid "is not"
 msgstr ""
 
-#: mail/folder-browser-factory.c:233
-msgid "VFolder on Se_nder"
+#: filter/libfilter-i18n.h:38
+msgid "is"
 msgstr ""
 
-#: mail/folder-browser-factory.c:238
-msgid "VFolder on _Recipients"
+#: filter/libfilter-i18n.h:39
+msgid "on or after"
 msgstr ""
 
-#: mail/folder-browser-factory.c:245
-msgid "_Filter on Subject"
+#: filter/libfilter-i18n.h:40
+msgid "on or before"
 msgstr ""
 
-#: mail/folder-browser-factory.c:250
-msgid "Fi_lter on Sender"
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
 msgstr ""
 
-#: mail/folder-browser-factory.c:255
-msgid "Filter on Rec_ipients"
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
 msgstr ""
 
-#: mail/folder-browser-factory.c:262
-msgid "F_older"
-msgstr "фЗ╢У(_o)"
+#: filter/libfilter-i18n.h:43
+msgid "was after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "was before"
+msgstr ""
+
+#: filter/score-editor.c:127
+msgid "Add Rule"
+msgstr ""
+
+#: filter/score-editor.c:166
+msgid "Edit Score Rule"
+msgstr ""
+
+#: filter/score-rule.c:192 filter/score-rule.c:194
+#, fuzzy
+msgid "Score"
+msgstr "а╓╥д"
+
+#: filter/vfolder-editor.c:155
+msgid "Add VFolder Rule"
+msgstr ""
+
+#: filter/vfolder-editor.c:204
+msgid "Edit VFolder Rule"
+msgstr ""
+
+#: mail/component-factory.c:227
+msgid "Cannot initialize Evolution's mail component."
+msgstr ""
+
+#: mail/component-factory.c:266
+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
+msgid "Save"
+msgstr "юЗюЕ"
+
+#: mail/folder-browser.c:153
+msgid "Body or subject contains"
+msgstr ""
+
+#: mail/folder-browser.c:154
+msgid "Body contains"
+msgstr ""
+
+#: mail/folder-browser.c:155
+#, fuzzy
+msgid "Subject contains"
+msgstr "а╕╦Я"
+
+#: mail/folder-browser.c:156
+msgid "Body does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:157
+msgid "Subject does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:454
+#, fuzzy
+msgid "VFolder on Sender"
+msgstr "╨╦Ё╫юл©║╟т ╢ДюЕ(_S)"
+
+#: mail/folder-browser.c:455
+#, fuzzy
+msgid "VFolder on Recipients"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
+
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:458
+#, fuzzy
+msgid "Filter on Sender"
+msgstr "╨╦Ё╫юл©║╟т ╢ДюЕ(_S)"
+
+#: mail/folder-browser.c:459
+#, fuzzy
+msgid "Filter on Recipients"
+msgstr "╧ч╢б╩Г╤В ╦Я╥о"
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "©╜╠Б..."
+
+#: mail/folder-browser.c:466
+#, fuzzy
+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
+msgid "Print"
+msgstr "юн╪Б"
 
-#: mail/folder-browser-factory.c:266
-msgid "_Mark all as Read"
+#: mail/folder-browser.c:469
+#, fuzzy
+msgid "Reply to Sender"
+msgstr "╨╦Ё╫юл©║╟т ╢ДюЕ(_S)"
+
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
+msgid "Reply to All"
+msgstr "╦П╣н ╢ДюЕ"
+
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr "юЭ╢ч"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "юЭ╢ч"
+
+#: mail/folder-browser.c:474
+#, fuzzy
+msgid "Mark as Read"
 msgstr "╦П╣н юпю╨ ╟мю╦╥н г╔╫ц(_M)"
 
-#: mail/folder-browser-factory.c:271
-msgid "_Delete all"
-msgstr "╦П╣н ╩Ха╕(_D)"
+#: mail/folder-browser.c:475
+#, fuzzy
+msgid "Mark as Unread"
+msgstr "╦П╣н юпю╨ ╟мю╦╥н г╔╫ц(_M)"
 
-#: mail/folder-browser-factory.c:276
-msgid "_Expunge"
-msgstr "а╕╟е(_E)"
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "╟Мд╔©╧а╓: фЗ╢У╥н юл╣©(_M)..."
 
-#: mail/folder-browser-factory.c:281
-msgid "_Configure Folder"
-msgstr "фЗ╢У ╪Ёа╓(_C)"
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "╟Мд╔©╧а╓: фЗ╢У╥н юл╣©(_M)..."
+
+#: mail/folder-browser.c:480
+#, fuzzy
+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
+#, fuzzy
+msgid "Apply Filters"
+msgstr "гйем"
 
-#: mail/mail-callbacks.c:83
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
+
+#: mail/mail-autofilter.c:71
+#, c-format
+msgid "Mail to %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "а╕╦Я"
+
+#: mail/mail-autofilter.c:230
+#, fuzzy, c-format
+msgid "Mail from %s"
+msgstr "%s©║╪╜ фМаЖ ╟║а╝©ю╠Б"
+
+#: mail/mail-autofilter.c:331
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: mail/mail-callbacks.c:74
 msgid ""
-"You need to configure the mail client\n"
-"before you can compose mail."
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:96
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:110
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:184
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+msgid "You have no mail sources configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:213
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:222
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:395
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:397
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr ""
 
-#: mail/mail-callbacks.c:466
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:556
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "╦ч╪╪аЖ╦╕ юЗюЕгу╢о╢ы"
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "╦ч╪╪аЖ╦╕ юЗюЕгу╢о╢ы"
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-config-gui.c:435
+#: mail/mail-callbacks.c:922
+#, fuzzy
+msgid "Print Message"
+msgstr "╦ч╪╪аЖ юн╪Б(_P)"
+
+#: mail/mail-callbacks.c:969
+#, fuzzy
+msgid "Printing of message failed"
+msgstr "╦ч╪╪аЖ юн╪Б(_P)"
+
+#.
+#. * 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
+msgid "Identity"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config-gui.c:448
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "юЭц╪юл╦╖:"
 
-#: mail/mail-config-gui.c:472
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "юЭюз©ЛфМ аж╪р:"
 
-#: mail/mail-config-gui.c:487
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "а╤аВ:"
 
-#: mail/mail-config-gui.c:498
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "╪╜╦М фдюо:"
 
-#: mail/mail-config-gui.c:503 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "╪╜╦М фдюо"
 
-#: mail/mail-config-gui.c:930
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "╪╜╧Ж:"
 
-#: mail/mail-config-gui.c:933
-msgid "Port:"
-msgstr "фВф╝:"
-
-#: mail/mail-config-gui.c:938
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "╩Г©Кюзюл╦╖:"
 
-#: mail/mail-config-gui.c:944
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "╟Ф╥н:"
 
-#: mail/mail-config-gui.c:952
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "юнаУ:"
 
-#: mail/mail-config-gui.c:964
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr ""
 
-#: mail/mail-config-gui.c:989
+#: 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 ""
 
-#: mail/mail-config-gui.c:1001
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr ""
 
-#: mail/mail-config-gui.c:1133 mail/mail-config-gui.c:1181
+#: mail/mail-config-gui.c:1130
+#, fuzzy
+msgid "Mail source type:"
+msgstr "╠чаЖ╧Ф╧Щ:"
+
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3591,7 +4290,12 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1157
+#: mail/mail-config-gui.c:1154
+#, fuzzy
+msgid "News source type:"
+msgstr "╩У юЭх╜ гЭеб"
+
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3600,516 +4304,781 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1176
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1231
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1233
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1325
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr ""
 
-#: mail/mail-config-gui.c:1327
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr ""
 
-#: mail/mail-config-gui.c:1422
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr ""
 
-#: mail/mail-config-gui.c:1424
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr ""
 
-#: mail/mail-config-gui.c:2290
+#: mail/mail-config-gui.c:2253
+#, fuzzy, c-format
+msgid "Testing \"%s\""
+msgstr "\"%s\"╦╕ ╩Щ╪╨аъ"
+
+#: mail/mail-config-gui.c:2255
+#, c-format
+msgid "Test connection to \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 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.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
+#: mail/mail-config-gui.c:2346
+#, c-format
+msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "а╤аВ"
+#: mail/mail-config-gui.c:2348
+#, c-format
+msgid "Query authorization at \"%s\""
+msgstr ""
 
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "фМаЩ"
+#: po/tmp/mail-config.glade.h:7
+msgid "Address"
+msgstr "аж╪р"
 
-#: mail/mail-config.glade.h:15
-msgid "Sources"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
 msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
 msgstr ""
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "╢╨╫╨ ╪╜╧Ж"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "а╤аВ"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr ""
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
 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.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+msgid "Please enter your PGP/GPG passphrase."
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+msgid "No password provided."
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
+#: mail/mail-crypto.c:625
+msgid "No GPG/PGP program available."
 msgstr ""
 
-#: mail/mail-config-druid.glade.h:17
+#: mail/mail-display.c:90
+#, c-format
 msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
+"Could not open file %s:\n"
+"%s"
 msgstr ""
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
-msgid "Please enter your PGP/GPG passphrase."
+#: mail/mail-display.c:113
+#, c-format
+msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
-msgid "No password provided."
+#: mail/mail-display.c:218
+#, fuzzy
+msgid "Save Attachment"
+msgstr "╟Мд╔©╧а╓: ц╥╨нфдюо юЗюЕ..."
+
+#: mail/mail-display.c:258
+#, c-format
+msgid "Could not create temporary directory: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-display.c:300
+#, fuzzy
+msgid "Save to Disk..."
+msgstr "юЗюЕ..."
+
+#: mail/mail-display.c:302
+#, fuzzy, c-format
+msgid "Open in %s..."
+msgstr "©╜╠Б..."
+
+#: mail/mail-display.c:304
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:328
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:351
 #, c-format
-msgid "Couldn't create pipe to GPG/PGP: %s"
+msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-crypto.c:600
-msgid "No GPG/PGP program available."
+#: mail/mail-display.c:355
+#, fuzzy
+msgid "Hide"
+msgstr "╦с╦╝╦╩:"
+
+#: mail/mail-format.c:500
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "ц╥╨нфдюо цъ╟║"
+
+#: mail/mail-format.c:623
+#, fuzzy
+msgid "Reply-To:"
+msgstr "╢ДюЕ"
+
+#: mail/mail-format.c:845
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+msgid "Encrypted message not displayed"
+msgstr ""
+
+#: mail/mail-format.c:863
+#, fuzzy
+msgid "Encrypted message"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1486
+#, c-format
+msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/mail-local.c:257
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-ops.c:74
+#: mail/mail-local.c:261
+#, fuzzy
+msgid "Closing current folder"
+msgstr "фЗ╢У ╪Ёа╓(_C)"
+
+#: mail/mail-local.c:293
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:314
+#, fuzzy
+msgid "Creating new folder"
+msgstr "╩У фЗ╢У ╩Щ╪╨(_C)..."
+
+#: mail/mail-local.c:329
+#, fuzzy
+msgid "Copying messages"
+msgstr "╦ч╪╪аЖ ╨╧╩Г(_C)"
+
+#: mail/mail-local.c:341
+#, 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
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
+#: mail/mail-local.c:781
+msgid "Registering local folder"
+msgstr ""
+
+#: mail/mail-local.c:783
+msgid "Register local folder"
+msgstr ""
+
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "%s©║╪╜ фМаЖ ╟║а╝©ю╠Б"
 
-#: mail/mail-ops.c:76
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "%s©║╪╜ фМаЖ ╟║а╝©ю╠Б"
 
-#: mail/mail-ops.c:87
-msgid "You have no remote mail source configured to fetch mail from."
+#: mail/mail-ops.c:331
+#, c-format
+msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:97
-msgid "Bad folder passed to fetch_mail"
+#: mail/mail-ops.c:401
+msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:166
-#, c-format
-msgid "There is no new mail at %s."
+#: mail/mail-ops.c:403
+msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:237
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" ╨╦Ё╩╢б аъ"
 
-#: mail/mail-ops.c:242
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:245
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "\"%s\" ╨╦Ё©"
 
-#: mail/mail-ops.c:248
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:406
+#: mail/mail-ops.c:720
+#, fuzzy
+msgid "Sending queue"
+msgstr "\"%s\" ╨╦Ё╩╢б аъ"
+
+#: mail/mail-ops.c:722
+msgid "Send queue"
+msgstr ""
+
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#, fuzzy, c-format
+msgid "Appending \"%s\""
+msgstr "\"%s\" ╨╦Ё╩╢б аъ"
+
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
+msgid "Appending a message without a subject"
+msgstr ""
+
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "\"%s\" а╕╟е аъ"
 
-#: mail/mail-ops.c:408
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "\"%s\" а╕╟е"
 
-#: mail/mail-ops.c:480
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:482
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:485
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:487
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:545
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "юл╣©аъ"
 
-#: mail/mail-ops.c:548
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "╨╧╩Гаъ"
 
-#: mail/mail-ops.c:560
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:641
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:644
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:803
+#: mail/mail-ops.c:1175
+#, fuzzy, c-format
+msgid "Marking message %d of %d"
+msgstr "╦ч╪╪аЖ \"%s\"╦╕ юЭ╢чгу╢о╢ы"
+
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:806
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:861
-#, c-format
-msgid "Found subfolder \"%s\""
-msgstr ""
-
-#: mail/mail-ops.c:895
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(╪Ё╦М ╬Ью╫)"
 
-#: mail/mail-ops.c:958
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:961
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1087
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "╦ч╪╪аЖ \"%s\"╦╕ юЭ╢чгу╢о╢ы"
 
-#: mail/mail-ops.c:1092
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1095
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "╦ч╪╪аЖ \"%s\"╦╕ юЭ╢ч"
 
-#: mail/mail-ops.c:1100
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1154
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1167
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1256
+#: mail/mail-ops.c:1665
+#, fuzzy
+msgid "Forwarded messages"
+msgstr "юЭ╢ч╣х ╦ч╫цаЖ - %s"
+
+#: mail/mail-ops.c:1679
+#, fuzzy
+msgid "Forwarded message:\n"
+msgstr "юЭ╢ч╣х ╦ч╫цаЖ - %s"
+
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "\"%s\"╦╕ юШюГ аъ"
 
-#: mail/mail-ops.c:1258
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "\"%s\"╦╕ юШюГ"
 
-#: mail/mail-ops.c:1377
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "\"%s\"╦╕ ╩Щ╪╨аъ"
 
-#: mail/mail-ops.c:1379
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "\"%s\"╦╕ ╩Щ╪╨"
 
-#: mail/mail-ops.c:1450
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1505
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1581
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1584
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1587
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1590
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:1717
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1720
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1832
-msgid "Loading Draftbox"
-msgstr ""
+#: mail/mail-ops.c:2244
+#, fuzzy, c-format
+msgid "Loading %s Folder"
+msgstr "\"%s\"╦╕ юШюГ аъ"
 
-#: mail/mail-ops.c:1834
-msgid "Load Draftbox"
-msgstr ""
+#: mail/mail-ops.c:2246
+#, fuzzy, c-format
+msgid "Load %s Folder"
+msgstr "\"%s\"╦╕ юШюГ"
 
-#: mail/mail-ops.c:1902
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1905
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1951
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-threads.c:274
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "╦ч╪╪аЖ \"%s\"╦╕ юЭ╢чгу╢о╢ы"
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н юл╣©гу╢о╢ы"
+
+#: mail/mail-ops.c:2474
+#, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:104
+msgid "Cancel"
+msgstr ""
+
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:676
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:680
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:745
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:856
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:865
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/mail-tools.c:206
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
-#: mail/mail-tools.c:293
+#. Get all uids of source
+#: mail/mail-tools.c:239
+#, fuzzy, c-format
+msgid "Examining %s"
+msgstr "\"%s\" а╕╟е аъ"
+
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#: mail/mail-tools.c:385
+#. Info
+#: mail/mail-tools.c:290
+#, c-format
+msgid "Retrieving message %d of %d"
+msgstr ""
+
+#. Append it to dest
+#: mail/mail-tools.c:303
 #, c-format
-msgid "[%s] %s"
+msgid "Writing message %d of %d"
 msgstr ""
 
-#: mail/mail-tools.c:387
+#: mail/mail-tools.c:332
+#, fuzzy, c-format
+msgid "Saving changes to %s"
+msgstr "╦ч╪╪аЖ╥н ╨╞╟Ф╩Ггвю╩ юЗа╓аъ..."
+
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr ""
 
-#: mail/mail-tools.c:396
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:433
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ - %s"
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "юЭ╢ч╣х ╦ч╫цаЖ (а╕╦Я ╬Ью╫)"
 
-#: mail/mail-tools.c:636
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr ""
-
-#: mail/mail-tools.c:665
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:302
+#: mail/mail-vfolder.c:147
+#, fuzzy
+msgid "VFolders"
+msgstr "фЗ╢У"
+
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr "╩У VфЗ╢У"
 
-#: mail/message-list.c:490
-msgid "Online Status"
+#. 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
+msgid "Reply"
+msgstr "╢ДюЕ"
+
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+msgid "Reply to the sender of this message"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╨╦Ё╫╩Г╤В©║╟т ╢ДюЕю╩ гу╢о╢ы"
+
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+msgid "Reply to all recipients of this message"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╧чю╨ ╦П╣Г ╩Г╤В©║╟т ╢ДюЕю╩ гу╢о╢ы"
+
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
+msgid "Forward this message"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╢ы╦╔╩Г╤В©║╟т юЭ╢чгу╢о╢ы"
+
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+msgid "Print the selected message"
+msgstr "╪╠ецгя ╦ч╪╪аЖ╦╕ юн╪Бгу╢о╢ы"
+
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+msgid "Delete this message"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╩Ха╕гу╢о╢ы"
+
+#: mail/message-list.c:572
+msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:526
-msgid "From"
-msgstr "╨╦Ё╫ ╩Г╤В"
+#: mail/message-list.c:575
+#, fuzzy
+msgid "Seen"
+msgstr "╨╦Ё©"
 
-#: mail/message-list.c:533
-msgid "Subject"
-msgstr "а╕╦Я"
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr ""
 
-#: mail/message-list.c:540
-msgid "Date"
-msgstr "Ё╞б╔"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
+msgstr ""
 
-#: mail/message-list.c:547
-msgid "Received"
-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
+#, c-format
+msgid "%s, et al."
+msgstr ""
+
+#: mail/message-list.c:860 mail/message-list.c:875
+msgid "<unknown>"
+msgstr ""
+
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
+msgstr ""
+
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
+msgstr ""
+
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
+msgstr ""
 
-#: mail/message-list.c:554
-msgid "To"
-msgstr "╧ч╢бюл"
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:561
-msgid "Size"
-msgstr "е╘╠Б"
+#: mail/subscribe-dialog.c:282
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr ""
 
-#: notes/component-factory.c:27
-msgid "Create a new note"
-msgstr "╩У ЁКф╝ ╩Щ╪╨"
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr ""
 
-#: notes/component-factory.c:148
-msgid "Cannot initialize Evolution's notes component."
+#: mail/subscribe-dialog.c:290
+#, c-format
+msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: notes/main.c:30
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "ЁКф╝ ддфВЁмф╝: Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr ""
 
-#: shell/e-setup.c:47
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr ""
 
-#: shell/e-setup.c:51
+#: shell/e-setup.c:116
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
+msgstr ""
+
+#: shell/e-setup.c:117
+msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+msgstr ""
+
+#: shell/e-setup.c:155
+msgid "Could not update files correctly"
+msgstr ""
+
+#: shell/e-setup.c:158 shell/e-setup.c:224
+msgid "Evolution files successfully installed."
+msgstr ""
+
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:52
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:69
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4117,18 +5086,14 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:84
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:88
-msgid "Evolution files successfully installed."
-msgstr ""
-
-#: shell/e-setup.c:109
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4136,7 +5101,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:121
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4144,7 +5109,7 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:81
+#: shell/e-shell-folder-creation-dialog.c:82
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -4153,11 +5118,11 @@ msgstr ""
 "╦М╫ц╣х фЗ╢У╦╕ ╩Щ╪╨гр ╪Ж ╬Ь╫ю╢о╢ы:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:133
+#: shell/e-shell-folder-creation-dialog.c:134
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:223
+#: shell/e-shell-folder-creation-dialog.c:225
 msgid "Evolution - Create new folder"
 msgstr ""
 
@@ -4167,31 +5132,31 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:272
+#: shell/e-shell-folder-selection-dialog.c:291
 msgid "New..."
 msgstr "╩У╥н©Н..."
 
-#: shell/e-shell-folder-title-bar.c:452 shell/e-shell-folder-title-bar.c:453
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
 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:113
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "╫ц╫╨ешюг ╟Ф╥н©║ Bug buddy╦╕ цёю╩╪Ж ╬Ь╫ю╢о╢ы."
 
 #. same as above
-#: shell/e-shell-view-menu.c:119
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy╦╕ ╫ггЮгр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/e-shell-view-menu.c:167
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -4201,161 +5166,101 @@ msgstr ""
 "юоа╓, ©╛╤ТцЁ ╟Э╦╝╦╕ го╢б ╠в╥Л©Ч╬Н юю©Кга╥н╠в╥╔\n"
 "╦Пю╫ ют╢о╢ы."
 
-#: shell/e-shell-view-menu.c:319
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:377
-msgid "_New"
-msgstr "╩У╥н©Н(_N)"
-
-#: shell/e-shell-view-menu.c:389
-msgid "_Folder"
-msgstr "фЗ╢У(_F)"
-
-#: shell/e-shell-view-menu.c:395
-msgid "Evolution bar _shortcut"
-msgstr "Evolution ╢эцЮ ╦╥╢К(_s)"
-
-#: shell/e-shell-view-menu.c:404
-msgid "_Mail message (FIXME)"
-msgstr "фМаЖ ╦ч╪╪аЖ(_M) (╟Мд╔©╧а╓)"
-
-#: shell/e-shell-view-menu.c:410
-msgid "_Appointment (FIXME)"
-msgstr "╬Ю╪с(_A) (╟Мд╔©╧а╓)"
-
-#: shell/e-shell-view-menu.c:416
-msgid "_Contact (FIXME)"
-msgstr "©╛╟А(_C) (╟Мд╔©╧а╓)"
-
-#: shell/e-shell-view-menu.c:422
-msgid "_Task (FIXME)"
-msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
-
-#: shell/e-shell-view-menu.c:444
-msgid "_Go to Folder..."
-msgstr ""
-
-#: shell/e-shell-view-menu.c:445
-msgid "Display a different folder"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:452
-msgid "_Create New Folder..."
-msgstr "╩У фЗ╢У ╩Щ╪╨(_C)..."
-
-#: shell/e-shell-view-menu.c:453 shell/e-shell-view-menu.c:465
-msgid "Create a new folder"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:464
-msgid "E_xit..."
-msgstr "а╬╥А(_x)..."
-
-#: shell/e-shell-view-menu.c:495
-msgid "Show _Shortcut Bar"
-msgstr "╢эцЮ ╦╥╢К ╨╦╠Б(_S)"
-
-#: shell/e-shell-view-menu.c:496
-msgid "Show the shortcut bar"
-msgstr "╢эцЮ ╦╥╢К ╨╦╠Б"
-
-#: shell/e-shell-view-menu.c:501
-msgid "Show _Folder Bar"
-msgstr "фЗ╢У ╦╥╢К ╨╦╠Б(_F)"
-
-#: shell/e-shell-view-menu.c:502
-msgid "Show the folder bar"
-msgstr "фЗ╢У ╦╥╢К ╨╦╠Б"
-
-#: shell/e-shell-view-menu.c:513
-msgid "_Settings"
-msgstr "╪Ёа╓(_S)"
-
-#: shell/e-shell-view-menu.c:524
-msgid "_Help"
-msgstr "╣╣©Р╦╩(_H)"
-
-#: shell/e-shell-view-menu.c:530
-msgid "Help _Index"
-msgstr "╣╣©Р╦╩ ╩Жюн(_I)"
-
-#: shell/e-shell-view-menu.c:537
-msgid "Getting _Started"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:544
-msgid "Using the _Mailer"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:551
-msgid "Using the _Calendar"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:558
-msgid "Using the C_ontact Manager"
-msgstr ""
-
-#: shell/e-shell-view-menu.c:568
-msgid "_Submit Bug Report"
-msgstr "╧Ж╠в а╕╨╦(_S)"
-
-#: shell/e-shell-view-menu.c:569
-msgid "Submit bug report using Bug Buddy"
-msgstr "bug-buddy╥н ╧Ж╠ва╕╨╦╦╕ гу╢о╢ы"
-
-#: shell/e-shell-view-menu.c:578
-msgid "_About Evolution..."
-msgstr "Evolutionю╨(_A)..."
-
-#: shell/e-shell-view-menu.c:579
-msgid "Show information about Evolution"
-msgstr ""
-
-#: shell/e-shell-view.c:127
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:395
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "фЗ╢У"
 
-#: shell/e-shell-view.c:941
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr ""
 
-#: shell/e-shell.c:290
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "╫ц╫╨еш юЗюЕюЕд║╦╕ аЖа╓гр╪Ж ╬Ь╫ю╢о╢ы -- %s"
 
-#: shell/e-shortcuts-view.c:235
-msgid "_Small icons"
+#: shell/e-shell.c:1208
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:122
+#, fuzzy
+msgid "Create new shortcut group"
+msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
+
+#: shell/e-shortcuts-view.c:125
+#, fuzzy
+msgid "Group name:"
+msgstr "юЭц╪юл╦╖:"
+
+#: shell/e-shortcuts-view.c:234
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:239
+msgid "Don't remove"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:250
+msgid "_Small Icons"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:251
 msgid "Show the shortcuts as small icons"
 msgstr "юшю╨ ╬фюлдэю╦╥н ╢эцЮ╦╥╢К ╨╦╠Б"
 
-#: shell/e-shortcuts-view.c:238
-msgid "_Large icons"
+#: shell/e-shortcuts-view.c:253
+#, fuzzy
+msgid "_Large Icons"
 msgstr "е╚ ╬фюлдэ(_L)"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Show the shortcuts as large icons"
 msgstr "е╚ ╬фюлдэю╦╥н ╢эцЮ╦╥╢К ╨╦╠Б"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:265
+#, fuzzy
+msgid "_New Group..."
+msgstr "╩У╥н©Н..."
+
+#: shell/e-shortcuts-view.c:266
+#, fuzzy
+msgid "Create a new shortcut group"
+msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
+
+#: shell/e-shortcuts-view.c:268
+msgid "_Remove This Group..."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:269
+#, fuzzy
+msgid "Remove this shortcut group"
+msgstr "╢эцЮ ╦╥╢К ╨╦╠Б"
+
+#: shell/e-shortcuts-view.c:353
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:353
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:356
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
@@ -4363,63 +5268,65 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage.c:235
+#: 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
+msgid "_View"
+msgstr ""
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "╪╠ец╣х фЗ╢У ╨╦╠Б"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(юл╦╖ ╬Ью╫)"
 
-#: shell/e-storage.c:430
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "©║╥╞ ╬Ью╫"
 
-#: shell/e-storage.c:432
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:434
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:436
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:438
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr ""
 
-#: shell/e-storage.c:440
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr ""
 
-#: shell/e-storage.c:442
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr ""
 
-#: shell/e-storage.c:444
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:446
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:448
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:450
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage.c:452
-msgid "Unknown error"
-msgstr ""
-
-#: shell/e-storage-set-view.c:221
-msgid "View the selected folder"
-msgstr "╪╠ец╣х фЗ╢У ╨╦╠Б"
-
-#: shell/main.c:67
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -4441,7 +5348,7 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:94
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -4449,141 +5356,1188 @@ msgstr ""
 "╟╗╩Ггу╢о╢ы\n"
 "Evolution фю\n"
 
-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Evolution ╫╘ю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: shell/main.c:159
+#: shell/main.c:178
+msgid "Disable."
+msgstr ""
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "╨╦ЁК╨╦ ддфВЁмф╝ ╫ц╫╨ешю╩ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы."
 
-#: tests/ui-tests/message-browser.c:360
-msgid "The component now claims that it doesn't support PersistStream!"
+#.
+#. * 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 ""
 
-#: tests/ui-tests/message-browser.c:378
-msgid ""
-"An exception occured while trying to load data into the component with "
-"PersistStream"
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
+#, fuzzy
+msgid "_Actions"
+msgstr "гЮ╣©(_n)"
+
+#: po/tmp/evolution-addressbook.xml.h:7
+msgid "Create a new contact"
+msgstr "╩У╥н©Н ©╛╤ТцЁ╦╕ ╦╦╣Г╢ы"
+
+#: po/tmp/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
+msgid "Find"
+msgstr "цё╠Б"
+
+#: po/tmp/evolution-addressbook.xml.h:11
+msgid "Find a contact"
+msgstr "©╛╤ТцЁ цё╬ф╨╩╢ы"
+
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+msgid "New"
+msgstr "╩У ©╛╤ТцЁ"
+
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
+msgstr "©╛╤ТцЁ╦╕ юн╪Бгя╢ы"
+
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
 msgstr ""
 
-#: tests/ui-tests/message-browser.c:471
-#, c-format
-msgid "The %s component doesn't support PersistStream!\n"
+#: po/tmp/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "Stop Loading"
+msgstr "╦М╬о"
+
+#: po/tmp/evolution-addressbook.xml.h:17
+msgid "View All"
 msgstr ""
 
-#: tests/ui-tests/message-browser.c:710
-msgid "Open Mime Message"
-msgstr "╦╤юс ╦ч╫цаЖ ©╜╠Б"
+#: po/tmp/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "View all contacts"
+msgstr "©╛╤ТцЁ цё╬ф╨╩╢ы"
+
+#: po/tmp/evolution-addressbook.xml.h:19
+msgid "_Print Contacts..."
+msgstr "©╛╤ТцЁ╦╕ юн╪Б(_P)..."
+
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+msgid "_Tools"
+msgstr "╣╣╠╦(_T)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: widgets/e-table/e-table-config.glade.h:7
-msgid "Fields"
-msgstr "гй╣Е"
+#: po/tmp/evolution-calendar.xml.h:6
+msgid "5 Days"
+msgstr "╢Е╩У╬© ╨╦юл╠Б"
 
-#: widgets/e-table/e-table-config.glade.h:8
-msgid "Grouping"
-msgstr "╧╜╠Б"
+#: po/tmp/evolution-calendar.xml.h:7
+msgid "Alter preferences"
+msgstr ""
 
-#: widgets/e-table/e-table-config.glade.h:9
-msgid "Sort"
-msgstr "а╓╥д"
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "╩У ╢ч╥б(_l)"
 
-#: widgets/e-table/e-table-config.glade.h:10
-msgid "Filter"
-msgstr "гйем"
+#: po/tmp/evolution-calendar.xml.h:9
+msgid "Calendar Preferences..."
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:10
+msgid "Create a new appointment"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:11
+msgid "Create a new calendar"
+msgstr "╩У ╢ч╥бю╩ ╦╦╣Л╢о╢ы"
+
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:15
+msgid "Go to"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:16
+msgid "Go to a specific date"
+msgstr "юсюгюг Ё╞╥н ╟║╠Б"
+
+#: po/tmp/evolution-calendar.xml.h:17
+msgid "Go to present time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:18
+msgid "Month"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+msgid "Next"
+msgstr "╢ыю╫"
+
+#: po/tmp/evolution-calendar.xml.h:21
+msgid "Open a calendar"
+msgstr "╢ч╥бю╩ ©╠╢о╢ы"
+
+#: po/tmp/evolution-calendar.xml.h:22
+msgid "Prev"
+msgstr "юлюЭ"
+
+#: po/tmp/evolution-calendar.xml.h:24
+msgid "Print this calendar"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr "го╥Г╬© ╨╦юл╠Б"
+
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+msgid "Today"
+msgstr "©ю╢ц"
+
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "аж"
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+msgid "_New"
+msgstr "╩У╥н©Н(_N)"
+
+#: po/tmp/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "╢ч╥б ©╜╠Б(_l)"
+
+#: po/tmp/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "_Print this calendar"
+msgstr "юл гв╦Яю╩ юн╪Б"
+
+#: po/tmp/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save Calendar As"
+msgstr "╢ч╥б юЗюЕ"
+
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "юл гв╦Я╦╕ ╩Ха╕гу╢о╢ы"
+
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "╩Ха╕"
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+#, fuzzy
+msgid "Help"
+msgstr "╣╣©Р╦╩(_H)"
+
+#: po/tmp/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
+msgid "Print this item"
+msgstr "юл гв╦Яю╩ юн╪Б"
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/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
+#, fuzzy
+msgid "Save _As..."
+msgstr "юЗюЕ..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr "юЗюЕхд ╦╤д╖"
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+#, fuzzy
+msgid "Save the contact and close the dialog box"
+msgstr "╬Ю╪сю╩ юЗюЕгяхд ╢ыюл╬С╥н╠в╦╕ ╢щ╢б╢ы"
+
+#: po/tmp/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
+msgid "See online help"
+msgstr "©б╤Сюн ╣╣©Р╦╩ю╩ ╨╦©╘аь╢ы"
+
+#: po/tmp/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
+msgid "_File"
+msgstr "фдюо(_F)"
+
+#: po/tmp/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
+#, fuzzy
+msgid "_Save"
+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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: widgets/e-table/e-table-field-chooser.glade.h:7
-#: widgets/e-table/e-table-header-item.c:1164
-msgid "Field Chooser"
-msgstr "гй╣Е ╪╠ец╠Б"
+#: po/tmp/evolution-event-editor.xml.h:6
+msgid "About this application"
+msgstr ""
 
-#: widgets/e-table/e-table-field-chooser.glade.h:8
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
+#: po/tmp/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "About..."
+msgstr "╠ш╡ц..."
+
+#: po/tmp/evolution-event-editor.xml.h:8
+msgid "Actio_ns"
+msgstr "гЮ╣©(_n)"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "юз╣©бВ"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "юз╦ё╠Б"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Clear"
+msgstr "юз╣©бВ"
+
+#: po/tmp/evolution-event-editor.xml.h:12
+#, fuzzy
+msgid "Clear the selection"
+msgstr "╪╠ец╣х фЗ╢У ╨╦╠Б"
+
+#: po/tmp/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
+msgid "Copy"
+msgstr "╨╧╩Г"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "юз╦ё╠Б"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr "╟Мд╔©╧а╓: ╪╠ец..."
+
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:28
+#, fuzzy
+msgid "FIXME: Define Print _Styles"
+msgstr "╟Мд╔©╧а╓: юн╪Б гЭ╫д а╓юг(_S)..."
+
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
+msgstr "╟Мд╔©╧а╓: юЭ╢ч(_w)"
+
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr "╟Мд╔©╧а╓: ╨р©оюЭгя еб╫╨е╘(_c)"
+
+#: po/tmp/evolution-event-editor.xml.h:35
+#, fuzzy
+msgid "FIXME: Insert File"
+msgstr "╟Мд╔©╧а╓: ╩Ха╕"
+
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:38
+msgid "FIXME: Print Pre_view"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr "╟Мд╔©╧а╓: ╪ш╫е(_e)"
+
+#: po/tmp/evolution-event-editor.xml.h:43
+msgid "FIXME: Save Attac_hments..."
+msgstr "╟Мд╔©╧а╓: ц╥╨нфдюо юЗюЕ..."
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr "╟Мд╔©╧а╓: юш╬В ©Дц╩(_R)"
+
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr "╟Мд╔©╧а╓: ╠ш╡ц(_F)..."
+
+#: po/tmp/evolution-event-editor.xml.h:50
+#, fuzzy
+msgid "FIXME: _Formatting"
+msgstr "╟Мд╔©╧а╓: ©╛╟А(_C)"
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr "╟Мд╔©╧а╓: юБаЖ гв╦Я(_J)"
+
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:54
+msgid "FIXME: _Mail Message"
+msgstr "╟Мд╔©╧а╓: фМаЖ ╦ч╪╪аЖ(_M)"
+
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr "╟Мд╔©╧а╓: ╦ч╦П гЭ╫д(_M)"
+
+#: po/tmp/evolution-event-editor.xml.h:56
+msgid "FIXME: _Move to Folder..."
+msgstr "╟Мд╔©╧а╓: фЗ╢У╥н юл╣©(_M)..."
+
+#: po/tmp/evolution-event-editor.xml.h:57
+msgid "FIXME: _New Appointment"
+msgstr "╟Мд╔©╧а╓: ╩У ╬Ю╪с(_N)"
+
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr "╟Мд╔©╧а╓: ЁКф╝(_N)"
+
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr "╟Мд╔©╧а╓: юш╬В(_T)"
+
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr ""
+
+#: po/tmp/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
+msgid "F_ormat"
+msgstr "гЭ╫д(_o)"
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr "╢ыю╫ гв╦Яю╦╥н юл╣©"
+
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr "юлюЭ гв╦Яю╦╥н юл╣©"
+
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:73
+#, fuzzy
+msgid "N_ext"
+msgstr "╢ыю╫"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "╨ыюл╠Б"
+
+#: po/tmp/evolution-event-editor.xml.h:76
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "е╛╦Ё╨╦╣Е©║╪╜ гв╦Яю╩ ╨╧╩Ггу╢о╢ы"
+
+#: po/tmp/evolution-event-editor.xml.h:77
+msgid "Pre_vious"
+msgstr "юлюЭ(_v)"
+
+#: po/tmp/evolution-event-editor.xml.h:78
+#, fuzzy
+msgid "Previous"
+msgstr "юлюЭ(_v)"
+
+#: po/tmp/evolution-event-editor.xml.h:79
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "юн╪Б..."
+
+#: po/tmp/evolution-event-editor.xml.h:80
+#, fuzzy
+msgid "Print Setup"
+msgstr "бй ╪Ёа╓(_u)"
+
+#: po/tmp/evolution-event-editor.xml.h:83
+#, fuzzy
+msgid "Properties"
+msgstr "╪Ёа╓..."
+
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "а╕╟е"
+
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "╢ДюЕ"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "Save the current file"
+msgstr "╪╜╦М фдюо:"
+
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:99
+#, fuzzy
+msgid "Select All"
+msgstr "фЗ╢У ╪╠ец"
+
+#: po/tmp/evolution-event-editor.xml.h:100
+#, fuzzy
+msgid "Select everything"
+msgstr "фЗ╢У ╪╠ец"
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+#, fuzzy
+msgid "Undo"
+msgstr "а╓╥д╬йгт"
+
+#: po/tmp/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
+#, fuzzy
+msgid "_About..."
+msgstr "Evolutionю╨(_A)..."
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "╢щ╠Б"
+
+#: po/tmp/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
+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
+msgid "_Edit"
+msgstr "╪Жа╓(_E)..."
+
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "цё╠Б..."
+
+#: po/tmp/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
+msgid "_Help"
+msgstr "╣╣©Р╦╩(_H)"
+
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr "╩Пют(_I)"
+
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "╨ыюл╠Б"
+
+#: po/tmp/evolution-event-editor.xml.h:117
+#, fuzzy
+msgid "_Print"
+msgstr "юн╪Б"
+
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "╪Ёа╓..."
+
+#: po/tmp/evolution-event-editor.xml.h:119
+#, fuzzy
+msgid "_Redo"
+msgstr "╨╦Ё©(_S)"
+
+#: po/tmp/evolution-event-editor.xml.h:120
+#, fuzzy
+msgid "_Replace..."
+msgstr "©╜╠Б(_O)..."
+
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
+msgstr "╣╣╠╦(_T)"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+#, fuzzy
+msgid "_Undo"
+msgstr "╨╦Ё©(_S)"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: widgets/e-table/e-table-group.glade.h:7
-msgid "window1"
+#: po/tmp/evolution-mail.xml.h:6
+msgid "Compose"
 msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:8
-msgid "Available fields"
-msgstr "╟║╢игя гй╣Е"
+#: po/tmp/evolution-mail.xml.h:7
+msgid "Compose a new message"
+msgstr "╩У ╦ч╪╪аЖ╦╕ юш╪╨гу╢о╢ы"
+
+#: po/tmp/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
+msgid "F_older"
+msgstr "фЗ╢У(_o)"
 
-#: widgets/e-table/e-table-group.glade.h:9
-msgid "label1"
+#: po/tmp/evolution-mail.xml.h:14
+msgid "Fi_lter on Sender"
 msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:10
-msgid "Show in this order"
-msgstr "юл ╪Ь╪╜╥н ╨╦╠Б"
+#: po/tmp/evolution-mail.xml.h:15
+msgid "Filter on Rec_ipients"
+msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:11
-msgid "label2"
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
 msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:12
-msgid "Add >>"
-msgstr "цъ╟║ >>"
+#: po/tmp/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Get Mail"
+msgstr "фМаЖ ╧ч╠Б"
+
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
+msgstr "фМаЖ гйем(_F)..."
+
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "╪Ё╦М:"
 
-#: widgets/e-table/e-table-group.glade.h:13
-msgid "<< Remove"
-msgstr "<< а╕╟е"
+#: po/tmp/evolution-mail.xml.h:23
+#, fuzzy
+msgid "Mar_k As Read"
+msgstr "╦П╣н юпю╨ ╟мю╦╥н г╔╫ц(_M)"
+
+#: po/tmp/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "╦П╣н юпю╨ ╟мю╦╥н г╔╫ц(_M)"
 
-#: widgets/e-table/e-table-header-item.c:1156
-msgid "Sort Ascending"
+#: po/tmp/evolution-mail.xml.h:25
+msgid "Move"
+msgstr "юл╣©"
+
+#: po/tmp/evolution-mail.xml.h:26
+msgid "Move message to a new folder"
+msgstr "╦ч╪╪аЖ╦╕ ╩У фЗ╢У╥н юл╣©гу╢о╢ы"
+
+#: po/tmp/evolution-mail.xml.h:27
+msgid "Previews the message to be printed"
 msgstr ""
 
-#: widgets/e-table/e-table-header-item.c:1157
-msgid "Sort Descending"
+#: po/tmp/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "юн╪Б ╧л╦╝╨╦╠Б"
+
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
 msgstr ""
 
-#: widgets/e-table/e-table-header-item.c:1158
-msgid "Unsort"
-msgstr "а╓╥д╬йгт"
+#: po/tmp/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Print message..."
+msgstr "╦ч╪╪аЖ юн╪Б(_P)"
 
-#: widgets/e-table/e-table-header-item.c:1160
-msgid "Group By This Field"
+#: po/tmp/evolution-mail.xml.h:35
+msgid "Reply to _All"
+msgstr "╦П╣н ╢ДюЕ(_A)"
+
+#: po/tmp/evolution-mail.xml.h:36
+msgid "Reply to _Sender"
+msgstr "╨╦Ё╫юл©║╟т ╢ДюЕ(_S)"
+
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#, fuzzy
+msgid "Select _All"
+msgstr "фЗ╢У ╪╠ец"
+
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: widgets/e-table/e-table-header-item.c:1161
-msgid "Group By Box"
-msgstr "╩Сюз╥н ╧╜╠Б"
+#: po/tmp/evolution-mail.xml.h:41
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "юЭ╢ч╣х ╦ч╫цаЖ - %s"
 
-#: widgets/e-table/e-table-header-item.c:1163
-msgid "Remove This Column"
+#: po/tmp/evolution-mail.xml.h:42
+msgid "VFolder on Se_nder"
 msgstr ""
 
-#: widgets/e-table/e-table-header-item.c:1166
-msgid "Alignment"
-msgstr "а╓╥д"
+#: po/tmp/evolution-mail.xml.h:43
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
+#, fuzzy
+msgid "_Apply Filters"
+msgstr "фМаЖ гйем(_F)..."
+
+#: po/tmp/evolution-mail.xml.h:46
+msgid "_Configure Folder"
+msgstr "фЗ╢У ╪Ёа╓(_C)"
+
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "╟Мд╔©╧а╓: фЗ╢У╥н юл╣©(_M)..."
+
+#: po/tmp/evolution-mail.xml.h:49
+msgid "_Edit Message"
+msgstr "╦ч╪╪аЖ фМаЩ(_E)"
+
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
+msgstr "а╕╟е(_E)"
+
+#: po/tmp/evolution-mail.xml.h:51
+msgid "_Filter on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:52
+msgid "_Forward"
+msgstr "юЭ╢ч(_F)"
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:55
+msgid "_Message"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "╟Мд╔©╧а╓: фЗ╢У╥н юл╣©(_M)..."
+
+#: po/tmp/evolution-mail.xml.h:57
+msgid "_Open in New Window"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:58
+msgid "_Print Message"
+msgstr "╦ч╪╪аЖ юн╪Б(_P)"
+
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ(_S)..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "╧Х©Люз(_S):"
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "╩Ха╕(_D)"
+
+#: po/tmp/evolution-mail.xml.h:63
+msgid "_VFolder on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
+msgstr ""
+
+#.
+#. * 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
+msgid "Attach"
+msgstr "ц╥╨н"
+
+#: po/tmp/evolution-message-composer.xml.h:9
+msgid "Close the current file"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:12
+msgid "Insert a file as text into the message"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert text file..."
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "╢ч╥бю╩ ©╠╢о╢ы"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "юЗюЕ"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "фЗ╢У╥н юЗюЕ(_f)..."
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "фЗ╢У╥н юЗюЕ(_f)..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "╦ч╪╪аЖ╦╕ аЖа╓гя фЗ╢У╥н юЗюЕгу╢о╢ы"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "╨╦Ё©"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+msgid "Send _Later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:26
+msgid "Send _later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send the mail in HTML format"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "╦ч╪╪аЖ╦╕ ╨╦Ёю╢о╢ы"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "юл ╦ч╪╪аЖ╦╕ ╨╦Ё©"
 
-#: widgets/e-table/e-table-header-item.c:1167
-msgid "Best Fit"
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "ц╥╨н╧╟ю╩ ╨╦╟еЁ╙ ╪Ш╠И╢о╢ы"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+msgid "Show _attachments"
+msgstr "ц╥╨н╧╟ ╨╦╠Б(_a)"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "ц╥╨н╧╟ ╨╦╠Б(_a)"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:41
+msgid "_Open..."
+msgstr "©╜╠Б(_O)..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: widgets/e-table/e-table-header-item.c:1168
-msgid "Format Columns..."
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
 msgstr ""
 
-#: widgets/e-table/e-table-header-item.c:1170
-msgid "Customize Current View..."
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:7
+#, fuzzy
+msgid "E_xit"
+msgstr "а╬╥А(_x)..."
+
+#: po/tmp/evolution.xml.h:8
+msgid "Evolution bar _shortcut"
+msgstr "Evolution ╢эцЮ ╦╥╢К(_s)"
+
+#: po/tmp/evolution.xml.h:9
+msgid "Exit the program"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:10
+msgid "Getting _Started"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:12
+#, fuzzy
+msgid "Show the _Folder Bar"
+msgstr "фЗ╢У ╦╥╢К ╨╦╠Б(_F)"
+
+#: po/tmp/evolution.xml.h:13
+#, fuzzy
+msgid "Show the _Shortcut Bar"
+msgstr "╢эцЮ ╦╥╢К ╨╦╠Б(_S)"
+
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "╧Ж╠в а╕╨╦(_S)"
+
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
+msgstr "bug-buddy╥н ╧Ж╠ва╕╨╦╦╕ гу╢о╢ы"
+
+#: po/tmp/evolution.xml.h:16
+#, fuzzy
+msgid "Toggle whether to show the folder bar"
+msgstr "фЗ╢У ╦╥╢К ╨╦╠Б"
+
+#: po/tmp/evolution.xml.h:17
+#, fuzzy
+msgid "Toggle whether to show the shortcut bar"
+msgstr "╢эцЮ ╦╥╢К ╨╦╠Б"
+
+#: po/tmp/evolution.xml.h:18
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:19
+msgid "Using the _Calendar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:21
+msgid "_About Evolution..."
+msgstr "Evolutionю╨(_A)..."
+
+#: po/tmp/evolution.xml.h:22
+msgid "_Appointment (FIXME)"
+msgstr "╬Ю╪с(_A) (╟Мд╔©╧а╓)"
+
+#: po/tmp/evolution.xml.h:23
+msgid "_Contact (FIXME)"
+msgstr "©╛╟А(_C) (╟Мд╔©╧а╓)"
+
+#: po/tmp/evolution.xml.h:26
+msgid "_Folder"
+msgstr "фЗ╢У(_F)"
+
+#: po/tmp/evolution.xml.h:27
+msgid "_Go to Folder..."
+msgstr ""
+
+#: po/tmp/evolution.xml.h:29
+#, fuzzy
+msgid "_Index"
+msgstr "╣╣©Р╦╩ ╩Жюн(_I)"
+
+#: po/tmp/evolution.xml.h:30
+msgid "_Mail message (FIXME)"
+msgstr "фМаЖ ╦ч╪╪аЖ(_M) (╟Мд╔©╧а╓)"
+
+#: po/tmp/evolution.xml.h:32
+msgid "_Settings"
+msgstr "╪Ёа╓(_S)"
+
+#: po/tmp/evolution.xml.h:33
+msgid "_Task (FIXME)"
+msgstr "юш╬В(_T) (╟Мд╔©╧а╓)"
+
+#. 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
+msgid "%A, %B %d, %Y"
 msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
@@ -4662,19 +6616,172 @@ 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:417
-msgid "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
+msgid "%B %Y"
 msgstr ""
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+#, 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
+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
+msgid "%I:%M %p"
+msgstr ""
+
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "╠в╥Л %i"
 
+#~ msgid "Could not start addressbook server"
+#~ msgstr "аж╪р╥о ╪╜╧Ж╦╕ ╫цюшгр ╪Ж╟║ ╬Ь╫ю╢о╢ы"
+
+#~ msgid "Error while communicating with address server"
+#~ msgstr "аж╪р╥о ╪╜╧Ж©м еК╫ею╩ го╢б ╣╣аъ ©ю╥Ы╧ъ╩Щ"
+
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "╟Мд╔©╧а╓: ╬Ю╪с(_A)"
+
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "╟Мд╔©╧а╓: х╦юг ©Дц╩(_q)"
+
+#~ msgid "Ne_xt"
+#~ msgstr "╢ыю╫(_x)"
+
+#~ msgid "Insert a file as an attachment"
+#~ msgstr "ц╥╨н╥н╪╜ фдюою╩ ╩Пютгя╢ы"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "а╓╦╩╥н юл ©╛╤ТцЁ╦╕\n"
+#~ "аЖ©Л╠Б╦╕ ©Ьго╫й╢о╠Н?"
+
+#~ msgid "_New Contact"
+#~ msgstr "╩У ©╛╤ТцЁ(_N)"
+
+#~ msgid "_New appointment..."
+#~ msgstr "╩У ╬Ю╪с(_N)"
+
+#~ msgid "FIXME: _Delete"
+#~ msgstr "╟Мд╔©╧а╓: ╩Ха╕(_D)"
+
+#~ msgid "FIXME: _New Task"
+#~ msgstr "╟Мд╔©╧а╓: ╩У еб╫╨е╘(_N)"
+
+#~ msgid "FIXME: Reply to A_ll"
+#~ msgstr "╟Мд╔©╧а╓: ╦П╣н ╢ДюЕ"
+
+#~ msgid "S_ubject:"
+#~ msgstr "а╕╦Я(_u):"
+
+#~ msgid "Owner:"
+#~ msgstr "╪рю╞юз:"
+
+#~ msgid "Save this appointment"
+#~ msgstr "юл ╬Ю╪сю╩ юЗюЕгу╢о╢ы"
+
+#~ msgid "Priority:"
+#~ msgstr "©Л╪╠╪Ью╖:"
+
+#~ msgid "Cut selected item into clipboard"
+#~ msgstr "╪╠ецгя гв╦Яю╩ е╛╦Ё╨╦╣Е╥н юз╦╗╢о╢ы"
+
+#~ msgid "Copy selected item into clipboard"
+#~ msgstr "╪╠ецгя гв╦Яю╩ е╛╦Ё╨╦╣Е╥н ╨╧╩Ггу╢о╢ы"
+
+#~ msgid "Select recipients' addresses"
+#~ msgstr "╧чю╩ ╩Г╤Вюг аж╪р ╪╠ец"
+
+#~ msgid "Search..."
+#~ msgstr "╟к╩Ж..."
+
+#~ msgid "Name"
+#~ msgstr "юл╦╖"
+
+#~ msgid "To: >>"
+#~ msgstr "╧ч╢б╩Г╤В: >>"
+
+#~ msgid "Cc: >>"
+#~ msgstr "бЭа╤: >>"
+
+#~ msgid "_Save..."
+#~ msgstr "юЗюЕ(_S)..."
+
+#~ msgid "_Close..."
+#~ msgstr "╢щ╠Б(_C)..."
+
+#~ msgid "_Format"
+#~ msgstr "гЭ╫д(_F)"
+
+#~ msgid "Check for new mail"
+#~ msgstr "╩У фМаЖ╦╕ х╝юнгу╢о╢ы"
+
+#~ msgid "_Delete Message"
+#~ msgstr "╦ч╪╪аЖ ╩Ха╕(_D)"
+
+#~ msgid "_Move Message"
+#~ msgstr "╦ч╪╪аЖ юл╣©(_M)"
+
+#~ msgid "_Delete all"
+#~ msgstr "╦П╣н ╩Ха╕(_D)"
+
+#~ msgid "Port:"
+#~ msgstr "фВф╝:"
+
+#~ msgid "From"
+#~ msgstr "╨╦Ё╫ ╩Г╤В"
+
+#~ msgid "To"
+#~ msgstr "╧ч╢бюл"
+
+#~ msgid "Size"
+#~ msgstr "е╘╠Б"
+
+#~ msgid "Create a new note"
+#~ msgstr "╩У ЁКф╝ ╩Щ╪╨"
+
+#~ msgid "Notes Component: Could not initialize bonobo"
+#~ msgstr "ЁКф╝ ддфВЁмф╝: Bonobo╦╕ цй╠Бх╜ гр╪Ж ╬Ь╫ю╢о╢ы"
+
+#~ msgid "Open Mime Message"
+#~ msgstr "╦╤юс ╦ч╫цаЖ ©╜╠Б"
+
+#~ msgid "Fields"
+#~ msgstr "гй╣Е"
+
+#~ msgid "Field Chooser"
+#~ msgstr "гй╣Е ╪╠ец╠Б"
+
+#~ msgid "Available fields"
+#~ msgstr "╟║╢игя гй╣Е"
+
+#~ msgid "Show in this order"
+#~ msgstr "юл ╪Ь╪╜╥н ╨╦╠Б"
+
+#~ msgid "Add >>"
+#~ msgstr "цъ╟║ >>"
+
+#~ msgid "<< Remove"
+#~ msgstr "<< а╕╟е"
+
+#~ msgid "Group By Box"
+#~ msgstr "╩Сюз╥н ╧╜╠Б"
 
+#~ msgid "Alignment"
+#~ msgstr "а╓╥д"
diff --git a/po/lt.po b/po/lt.po
index 50c670b32a..c28fab3cc6 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.6.1\n"
-"POT-Creation-Date: 2000-11-01 05:33+0200\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-13\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3044
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr "KortelК:"
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3048
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Vardas:"
 
-#: addressbook/backend/ebook/e-card.c:3047
+#: addressbook/backend/ebook/e-card.c:3049
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  PrieПdКlis:"
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3050
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Vardas:"
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  Papildomas:"
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  PavardК:"
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  GalШnК:"
 
-#: addressbook/backend/ebook/e-card.c:3065
+#: addressbook/backend/ebook/e-card.c:3067
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Gimimo data:"
 
-#: addressbook/backend/ebook/e-card.c:3076
+#: addressbook/backend/ebook/e-card.c:3078
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Adresas:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3080
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,13 +89,13 @@ msgstr ""
 "\n"
 "  PaПto dКЧК:"
 
-#: addressbook/backend/ebook/e-card.c:3079
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3082
 msgid ""
 "\n"
 "  Street:      "
@@ -103,7 +103,7 @@ msgstr ""
 "\n"
 "  GatvК:"
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  City:        "
@@ -111,7 +111,7 @@ msgstr ""
 "\n"
 "  Miestas:"
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
@@ -119,7 +119,7 @@ msgstr ""
 "\n"
 "  Regionas:"
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
@@ -127,7 +127,7 @@ msgstr ""
 "\n"
 "  PaПto kodas:"
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
@@ -135,13 +135,13 @@ msgstr ""
 "\n"
 "  ValstybК:"
 
-#: addressbook/backend/ebook/e-card.c:3097
+#: addressbook/backend/ebook/e-card.c:3099
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3109
+#: addressbook/backend/ebook/e-card.c:3111
 msgid ""
 "\n"
 "Telephones:\n"
@@ -149,7 +149,7 @@ msgstr ""
 "\n"
 "Telefonai:\n"
 
-#: addressbook/backend/ebook/e-card.c:3112
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
@@ -157,7 +157,7 @@ msgstr ""
 "\n"
 "Telefonas:"
 
-#: addressbook/backend/ebook/e-card.c:3136
+#: addressbook/backend/ebook/e-card.c:3138
 msgid ""
 "\n"
 "E-mail:\n"
@@ -165,7 +165,7 @@ msgstr ""
 "\n"
 "El. paПtas:\n"
 
-#: addressbook/backend/ebook/e-card.c:3139
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:"
@@ -173,7 +173,7 @@ msgstr ""
 "\n"
 "El. paПtas:"
 
-#: addressbook/backend/ebook/e-card.c:3158
+#: addressbook/backend/ebook/e-card.c:3160
 msgid ""
 "\n"
 "Mailer: "
@@ -181,7 +181,7 @@ msgstr ""
 "\n"
 "PaПto programa:"
 
-#: addressbook/backend/ebook/e-card.c:3164
+#: addressbook/backend/ebook/e-card.c:3166
 msgid ""
 "\n"
 "Time Zone: "
@@ -189,7 +189,7 @@ msgstr ""
 "\n"
 "Laiko juosta:"
 
-#: addressbook/backend/ebook/e-card.c:3172
+#: addressbook/backend/ebook/e-card.c:3174
 msgid ""
 "\n"
 "Geo Location: "
@@ -197,7 +197,7 @@ msgstr ""
 "\n"
 "Geogr. vietovК:"
 
-#: addressbook/backend/ebook/e-card.c:3176
+#: addressbook/backend/ebook/e-card.c:3178
 msgid ""
 "\n"
 "Business Role: "
@@ -205,7 +205,7 @@ msgstr ""
 "\n"
 "Verslo padКtis:"
 
-#: addressbook/backend/ebook/e-card.c:3188
+#: addressbook/backend/ebook/e-card.c:3190
 msgid ""
 "\n"
 "Org: "
@@ -213,7 +213,7 @@ msgstr ""
 "\n"
 "Organizacija:"
 
-#: addressbook/backend/ebook/e-card.c:3189
+#: addressbook/backend/ebook/e-card.c:3191
 msgid ""
 "\n"
 "  Name:  "
@@ -221,31 +221,31 @@ msgstr ""
 "\n"
 "  Vardas:"
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3192
 msgid ""
 "\n"
 "  Unit:  "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "Categories: "
@@ -253,7 +253,7 @@ msgstr ""
 "\n"
 "Kategorijos:"
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "Comment: "
@@ -271,7 +271,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "Unique String: "
@@ -279,7 +279,7 @@ msgstr ""
 "\n"
 "Unikali eilutК:"
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Public Key: "
@@ -291,10 +291,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:910
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1091
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "NegalКjau inicializuoti Bonobo"
 
@@ -417,28 +417,28 @@ msgstr ""
 "аvyko klaida, bandant gauti pilotЬ\n"
 "sЮraПЮ iП gnome-pilot demono"
 
-#: addressbook/conduit/address-conduit.c:193
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "NegalКjau Аkelti Чymeklio\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "NАekelta EBook\n"
 
-#: addressbook/conduit/address-conduit.c:490
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "NegalКjau paleisti wombat serverio"
 
-#: addressbook/conduit/address-conduit.c:491
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "NegalКjau paleisti wombat"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
@@ -459,113 +459,11 @@ msgstr "Daiktas (ai) priklauso Пioms kategorijoms:"
 msgid "Available Categories:"
 msgstr "Galimos kategorijos:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr "Asistento"
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr "Verslo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr "Verslo 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr "Verslo faksas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr "Atsakiklis"
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr "Automobilio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr "Kompanijos"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr "NamЬ"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr "NamЬ 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr "NamЬ faksas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr "Mobilus"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "Kitas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr "Kitas faksas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr "IeПkas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr "Pagrindinis"
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr "Teleksas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr "Pagrindinis el. paПtas"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr "El. paПtas 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-msgstr "El. paПtas 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ar tikrai nori iПtrinti \n"
-"ПА kontaktЮ?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "IПtrinti kontaktЮ?"
 
@@ -579,7 +477,7 @@ msgid "_Add"
 msgstr "_PridКti"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.h:72 ui/evolution-mail.h:48
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_IПtrinti"
 
@@ -592,11 +490,13 @@ msgstr "TelefonЬ tipai"
 msgid "New phone type"
 msgstr "Naujas telefono tipas"
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:71 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "PridКti"
 
@@ -636,6 +536,11 @@ msgstr "Verslo _faksas"
 msgid "_Mobile"
 msgstr "_Mobilus"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Pagrindinis el. paПtas"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "V_erslo"
@@ -649,7 +554,7 @@ msgid "C_ontacts..."
 msgstr "K_ontaktai..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Kategorijos..."
 
@@ -666,7 +571,7 @@ msgid "_Address..."
 msgstr "_Adresas..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Paprastai"
 
@@ -711,59 +616,146 @@ msgid "No_tes:"
 msgstr "Pas_tabos:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "IПsamiai"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Asistento"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Verslo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Verslo 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Verslo faksas"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Atsakiklis"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Automobilio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Kompanijos"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "NamЬ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "NamЬ 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "NamЬ faksas"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Kitas"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Kitas faksas"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "IeПkas"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Pagrindinis"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Teleksas"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "El. paПtas 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "El. paПtas 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "Adresas _2:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Kanada"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Patikrinti adresЮ"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Valst_ybК:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Suomija"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "JAV"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adresas:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Miestas:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_PO Box:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "Adresas _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Valstija/Provincija:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "JAV"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Suomija"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_ZIP/PaПto kodas:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "Valst_ybК:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -823,30 +815,25 @@ msgstr "_PavardК:"
 msgid "_Suffix:"
 msgstr "_GalШnК:"
 
-#: addressbook/gui/component/addressbook.c:275
-msgid "Quick Search"
-msgstr "Greita paieПka"
-
-#: addressbook/gui/component/addressbook.c:310
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "_MaЧos kortelКs"
 
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:9
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "LentelК"
 
-#: addressbook/gui/component/addressbook.c:444
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Negaliu atidaryti adresЬ knygelКs"
 
-#: addressbook/gui/component/addressbook.c:449
+#: addressbook/gui/component/addressbook.c:391
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -855,7 +842,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Mes negalКjome atidaryti Пios adresЬ knygelКs. Tai\n"
 "reiПkia arba tai, kad tu Аvedei neteisingЮ URI, arba \n"
@@ -866,7 +853,31 @@ msgstr ""
 "naudoti LDAP, tu turi parsisЬsti ir Аdiegti OpenLDAP,\n"
 "o tada perkompiliuoti ir Аdiegti Evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:584
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#, fuzzy
+msgid "Show All"
+msgstr "Rodyti"
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+msgid "Advanced..."
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "Tekstas turi"
+
+#: addressbook/gui/component/addressbook.c:534
+#, fuzzy
+msgid "Name contains"
+msgstr "turi"
+
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "turi"
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, kurА rodys AplankЬ narПyklК"
 
@@ -875,172 +886,169 @@ msgid "External Directories"
 msgstr "IПorinКs direktorijos"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: 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/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "LDAP serveris:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "Vardas:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Prievado numeris:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-msgstr "Vardas:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Pasirink vardus"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Rasti..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "LaiПko gavКjai"
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "Pasirink vardus"
+
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Pasirink vardЮ iП sЮraПo:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "LaiПko gavКjai"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "PaieПka"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "window2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "IПsaugoti kaip VCard"
 
@@ -1062,197 +1070,187 @@ msgstr ""
 "\n"
 "Dukart spragtelk, kad sukurtum naujЮ kontaktЮ."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:494 mail/mail-search-dialogue.c:101
-msgid "Search"
-msgstr "PaieПka"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Puslapio nuostatos:"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Stiliaus vardas:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "PerЧiШra:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Parinktys"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 pt. Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "аtraukti:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "TuПХios formos gale:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "Sekcijos:"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Tekstas"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "Seka iПkart vienas po kito"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "ApaХioje:"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "LaiПkЬ kortelКs Пone"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Matavimo vienetai:"
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "AntraПtКs kiekvienam laiПkui"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "пriftas..."
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "Prasideda naujame puslapyje"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "пriftai"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "StulpeliЬ skaiХius:"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "PoraПtК:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "TuПХios formos gale:"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Formatas"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "пriftai"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "AntraПtК"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "пriftas..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "AntraПtК/PoraПtК"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "AntraПtКs"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "AntraПtКs kiekvienam laiПkui"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Tekstas"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "AukПtis:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr "Seka iПkart vienas po kito"
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "пeПКliai"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "аtraukti:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "Spausdinti naudojant pilkus ПeПКlius"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "GulsХias lapas"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Formatas"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "KairКje:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Popierius"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "LaiПkЬ kortelКs Пone"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Tipas:"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "ParaПtКs"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "label26"
-msgstr "label26"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "StulpeliЬ skaiХius:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Matavimo vienetai:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Parinktys"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Plotis:"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Orientacija"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "AukПtis:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Puslapis"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "Puslapio nuostatos:"
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Popierius"
+
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Popieriaus Пaltinis:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "ParaПtКs"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "StaХias lapas"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "VirПuje:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "PerЧiШra:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "ApaХioje:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "Spausdinti naudojant pilkus ПeПКlius"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "KairКje:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "Apversti lyginiuose puslapiuose"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "DeПinКje:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Puslapis"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "Sekcijos:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "пeПКliai"
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Dydis:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Orientacija"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "StaХias lapas"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "Prasideda naujame puslapyje"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "GulsХias lapas"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Stiliaus vardas:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "AntraПtК"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "VirПuje:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "PoraПtК:"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Tipas:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "Apversti lyginiuose puslapiuose"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Plotis:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "AntraПtК/PoraПtК"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "label26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
 
@@ -1264,13 +1262,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:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "аvyko klaida, bendraujant su kalendoriaus serveriu"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nepavyko perskaityti piloto Calendar programos bloko"
 
@@ -1282,8 +1280,8 @@ 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:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "NegalКjau perskaityti piloto ToDo programos bloko"
 
@@ -1327,49 +1325,46 @@ msgstr "To-do punktas, kurio laikas Пiandien:"
 msgid "To-Do item that is overdue:"
 msgstr "To-do punktas, kurio laikas praКjФs:"
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Byla nerasta"
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Atidaryti kalendoriЬ"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "IПsaugoti kalendoriЬ"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y-%m-%d %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "VieПas"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "AsmeniПkas"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Slaptas"
 
@@ -1401,7 +1396,7 @@ msgstr "Skaidrus"
 msgid "Opaque"
 msgstr "Neskaidrus"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1413,36 +1408,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
-#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 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:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1452,15 +1446,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "ProcentinК reikПmК turi bШti tarp 0 ir 100 imtinai"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Svarbumas turi bШti tarp 1 ir 9 imtinai"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI, kurА rodys kalendorius"
 
@@ -1477,477 +1471,459 @@ msgid "No summary available."
 msgstr "Nepateikta santraukos."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-event-editor.h:19
-#: ui/evolution-subscribe.h:10
+#: 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
 msgid "Close"
 msgstr "UЧdaryti"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "UЧtildyti"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Keisti АvykА"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: 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
 msgid "Snooze time (minutes)"
 msgstr "UЧtildymo laikas (minutКmis)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "Kalendoriaus nuostatos"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Darbo savaitК"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Pir"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ant"
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 minutКs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Tre"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 minuХiЬ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Ket"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 valandЬ (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Pen"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 minuХiЬ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "пeП"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 valandЬ"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Sek"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 minuХiЬ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "Pirma savaitКs diena:"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 minuХiЬ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "PirmadienА"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr "PerspКjimai baigiasi po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Tuesday"
-msgstr "Antradienis"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "PerspКjimai garsu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Wednesday"
-msgstr "TreХiadienis"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr "PyptelКti, kai atsiranda aliarmo langai."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "Thursday"
-msgstr "Ketvirtadienis"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Kalendorius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "Friday"
-msgstr "Penktadienis"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "Kalendoriaus nuostatos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "Saturday"
-msgstr "пeПtadienis"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Spalvos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "SekmadienА"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr "Suspausti savaitgalius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "Dienos pradЧia:"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr "DatЬ navigatoriaus parinktys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Dienos pabaiga:"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "аprasta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Rodymo parinktys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "Laiko dalijimas:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "Laiko formatas:"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "Kada reikia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
-msgstr "Rodyti АvykiЬ pabaigos laikus"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr "Leisti uЧtildymЮ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
-msgstr "Suspausti savaitgalius"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Dienos pabaiga:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 valandЬ (am/pm)"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "Pirma savaitКs diena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 valandЬ"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "Pen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 minuХiЬ"
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Penktadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 minuХiЬ"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr "ParyПkinti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 minuХiЬ"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr "пiandienos Аvykius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 minuХiЬ"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr "пiandienos Аvykiai:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 minutКs"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr "аvykius, kurie dar ne Пiandien"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Date navigator options"
-msgstr "DatЬ navigatoriaus parinktys"
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
+msgstr "аvykiai, kurie dar ne Пiandien:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
-msgstr "Rodyti savaiХiЬ numerius"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "Pir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Kalendorius"
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "PirmadienА"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
-msgstr "Rodyti"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr "PraКjusius Аvykius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Kada reikia"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr "PraКjФ Аvykiai:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr "LikФs laikas"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "Pasirink spalvЮ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Svarbumas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr "ParyПkinti"
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr "Priminti man apie visus Аvykius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
-msgstr "PraКjusius Аvykius"
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr "Priminimas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Items Due Today"
-msgstr "пiandienos Аvykius"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "пeП"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
-msgstr "аvykius, kurie dar ne Пiandien"
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "пeПtadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Spalvos"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr "Rodyti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "Pasirink spalvЮ"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr "Rodyti АvykiЬ pabaigos laikus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Items Not Yet Due:"
-msgstr "аvykiai, kurie dar ne Пiandien:"
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "Rodyti savaiХiЬ numerius"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
-msgstr "пiandienos Аvykiai:"
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "Dienos pradЧia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Overdue Items:"
-msgstr "PraКjФ Аvykiai:"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "Sek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "SekmadienА"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "UЧduotys"
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "аprasta"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Remind me of all appointments"
-msgstr "Priminti man apie visus Аvykius"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
-msgstr "minutes prieП jiems Аvykstant."
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "Ket"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr "PerspКjimai vaizdu"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Ketvirtadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr "PyptelКti, kai atsiranda aliarmo langai."
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr "LikФs laikas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
-msgstr "PerspКjimai garsu"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr "Laiko dalijimas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
-msgstr "PerspКjimai baigiasi po"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr "Laiko formatas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "seconds."
-msgstr "sekundЧiЬ."
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "Ant"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr "Leisti uЧtildymЮ"
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Antradienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
-msgstr "Priminimas"
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
+msgstr "PerspКjimai vaizdu"
 
-#: calendar/gui/dialogs/task-editor.c:657
-msgid "Edit Task"
-msgstr "Taisyti uЧduotА"
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "Tre"
 
-#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:303
-msgid "No summary"
-msgstr "NКra santraukos"
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "TreХiadienis"
 
-#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:309
-#, c-format
-msgid "Appointment - %s"
-msgstr "аvykis -- %s"
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "Darbo savaitК"
 
-#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:312
-#, c-format
-msgid "Task - %s"
-msgstr "UЧduotis -- %s"
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr "minutes prieП jiems Аvykstant."
 
-#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:315
-#, c-format
-msgid "Journal entry - %s"
-msgstr "чurnalo АraПas -- %s"
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
+msgstr "sekundЧiЬ."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr "task-editor-dialog"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
-msgstr "_Santrauka"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
-msgstr "_PradЧios data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
-msgstr "_Kada reikia:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% А_vykdyta:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "_BШsena:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "NepradКta"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "K_lasifikacija:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "Vykdoma"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "Nutraukta"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "UЧbaigta"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Nutraukta"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "_Svarbumas:"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "UЧbaigimo data:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "AukПtas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Normalus"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "Vykdoma"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "чemas"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "K_lasifikacija:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22 shell/e-shell-view.c:989
-#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
-#: widgets/misc/e-dateedit.c:1171
+#. 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
 msgid "None"
 msgstr "Jokios"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Kontaktai..."
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Normalus"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "NepradКta"
+
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr "_Santrauka"
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr "_PradЧios data:"
+
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "UЧduotis"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "UЧbaigimo data:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:294
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "_Kontaktai..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr "_Kada reikia:"
+
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "_Svarbumas:"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "_BШsena:"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr "task-editor-dialog"
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Taisyti uЧduotА"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "NКra santraukos"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "аvykis -- %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "UЧduotis -- %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "чurnalo АraПas -- %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Atidaryti..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Atidaryti uЧduotА"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "PaЧymКti uЧbaigta"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "PaЧymКti, jog uЧduotis uЧbaigta"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:73 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:8
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:163
-#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-event-editor.h:13
-#: ui/evolution-mail.h:13
+#: 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:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "IПtrinti uЧduotА"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 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:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: 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
 msgid "New appointment..."
 msgstr "Naujas Аvykis..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "Taisyti ПА АvykА..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
-#: ui/evolution-event-editor.h:14
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "IПtrinti ПА АvykА"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Padaryti ПА АvykА judamu"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "IПtrinti ПА pasitaikymЮ"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "IПtrinti visus pasitaikymus"
 
@@ -1958,247 +1934,203 @@ msgstr "IПtrinti visus pasitaikymus"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:297
-msgid "Edit Appointment"
-msgstr "Taisyti АvykА"
-
-#: calendar/gui/event-editor.c:342
-msgid "on"
-msgstr "lygiai"
-
-#: calendar/gui/event-editor.c:470
-msgid "ocurrences"
-msgstr "kartus pasitaikys"
-
-#: calendar/gui/event-editor.c:2397 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
 #.
-#. figure out why alarm units aren't sticking between edits
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "Su_mmary:"
-msgstr "Sa_ntrauka:"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "Laikas"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "_PradЧios laikas:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "P_abaigos laikas:"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "Vis_os dienos Аvykis"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "аvykio pagrindai"
+
+#: po/tmp/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Klasifikacija"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "_VieПas"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "Kitoks pakartojimas"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "As_meniПkas"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Dienos"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
-msgstr "_Slaptas"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Kas"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "MinutКs"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "IПimtys"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: po/tmp/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Valandos"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "Dienos"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "SiЬsti _kam:"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Display"
-msgstr "_Vaizdu"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "MinutКs"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr "_Programa"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "Keisti"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Mail"
-msgstr "PaП_tu"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Jokio pakartojimo"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
-msgstr "SiЬsti _kam:"
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "PerЧiШra:"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Run program:"
-msgstr "Pa_leisti programЮ:"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "As_meniПkas"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "_Garsu"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "_VieПas"
+
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "Pasikartojimas"
+
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr "Pakartojimo taisyklК"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: po/tmp/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Priminimas"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Recur on the"
-msgstr "Atsitikti"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr "Paprastas pakartojimas"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "th day of the month"
-msgstr "-ЮjЮ mКnesio dienЮ"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr "Sa_ntrauka:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
-msgid "1st"
-msgstr "1-a"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Laikas"
 
-#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2-a"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "_Garsu"
 
-#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3-a"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "_Slaptas"
 
-#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
-msgid "4th"
-msgstr "4-a"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr "_Vaizdu"
 
-#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
-msgid "5th"
-msgstr "5-a"
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "P_abaigos laikas:"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Every"
-msgstr "Kas"
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "PaП_tu"
 
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid "month(s)"
-msgstr "mКnesА(ius)"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Programa"
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Recurrence"
-msgstr "Pasikartojimas"
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "Pa_leisti programЮ:"
 
-#: calendar/gui/event-editor-dialog.glade.h:55
-msgid "Appointment Basics"
-msgstr "аvykio pagrindai"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "_PradЧios laikas:"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "_PradЧios data:"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence Rule"
-msgstr "Pakartojimo taisyklК"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "dienЮ(as)"
 
-#: calendar/gui/event-editor-dialog.glade.h:59
-msgid "No recurrence"
-msgstr "Jokio pakartojimo"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "event-editor-dialog"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "Simple recurrence"
-msgstr "Paprastas pakartojimas"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
+msgstr "dКl"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-msgid "Custom recurrence"
-msgstr "Kitoks pakartojimas"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr "amЧinai"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "day(s)"
-msgstr "dienЮ(as)"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "label21"
+
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "mКnesА(ius)"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "iki"
 
-#: calendar/gui/event-editor-dialog.glade.h:64
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "savaitФ(es)"
 
-#: calendar/gui/event-editor-dialog.glade.h:66
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "metus"
 
-#: calendar/gui/event-editor-dialog.glade.h:67
-msgid "for"
-msgstr "dКl"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Taisyti АvykА"
 
-#: calendar/gui/event-editor-dialog.glade.h:68
-msgid "until"
-msgstr "iki"
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "lygiai"
 
-#: calendar/gui/event-editor-dialog.glade.h:69
-msgid "forever"
-msgstr "amЧinai"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "diena"
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid "Exceptions"
-msgstr "IПimtys"
+#: calendar/gui/event-editor.c:559
+#, fuzzy
+msgid "on the"
+msgstr "mКnesis"
 
-#: calendar/gui/event-editor-dialog.glade.h:72
-msgid "Modify"
-msgstr "Keisti"
+#: calendar/gui/event-editor.c:566
+#, fuzzy
+msgid "th"
+msgstr "4-a"
 
-#: calendar/gui/event-editor-dialog.glade.h:74
-msgid "label21"
-msgstr "label21"
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
+msgstr "kartus pasitaikys"
 
-#: calendar/gui/event-editor-dialog.glade.h:75
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
-"пis Аvykis turi kitokias pakartojimo taisykles, kuriЬ tu negali pakeisti su "
-"Evolution.\n"
-"\n"
-"Vis tik, Аvykis pasikartos reikiamu laiku ir bus teisingai parodytas "
-"kalendoriaus vaizduose."
+
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2296,11 +2228,11 @@ msgstr "penktadienis"
 msgid "saturday"
 msgstr "ПeПtadienis"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "metai"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "mКnesis"
 
@@ -2308,19 +2240,15 @@ msgstr "mКnesis"
 msgid "fortnight"
 msgstr "dvi savaitКs"
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "savaitК"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr "diena"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "valanda"
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "minutК"
 
@@ -2328,7 +2256,7 @@ msgstr "minutК"
 msgid "min"
 msgstr "min."
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "sekundК"
 
@@ -2348,8 +2276,8 @@ msgstr "vakar"
 msgid "today"
 msgstr "Пiandien"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "dabar"
 
@@ -2414,53 +2342,29 @@ msgstr "dvyliktas"
 msgid "ago"
 msgstr " "
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "Sukurti to-do punktЮ"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "Keisti to-do punktЮ"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Santrauka:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "Kada reikia:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Svarbumas:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "Daikto komentarai:"
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: 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/gnome-cal.c:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr "Nepavyko Аkelti kalendoriaus А ╔%s╢"
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Nepavyko sukurti kalendoriaus Хia: ╔%s╢"
 
-#: calendar/gui/gnome-cal.c:1166
+#: calendar/gui/gnome-cal.c:1174
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "Metodas, reikalingas Аkelti ╔%s╢, nepalaikomas"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
-#: mail/mail-search-dialogue.c:101
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Gerai"
 
@@ -2487,6 +2391,26 @@ msgstr ""
 msgid "Go to today"
 msgstr "пokti А ПiandienЮ"
 
+#: calendar/gui/print.c:288
+msgid "1st"
+msgstr "1-a"
+
+#: calendar/gui/print.c:288
+msgid "2nd"
+msgstr "2-a"
+
+#: calendar/gui/print.c:288
+msgid "3rd"
+msgstr "3-a"
+
+#: calendar/gui/print.c:288
+msgid "4th"
+msgstr "4-a"
+
+#: calendar/gui/print.c:288
+msgid "5th"
+msgstr "5-a"
+
 #: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6-ta"
@@ -2655,188 +2579,93 @@ msgstr "Esami metai (%Y)"
 msgid "Print Calendar"
 msgstr "Spausdinti kalendoriЬ"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:833
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Spaudino perЧiШra"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "Laiko rodymas"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Laiko formatas"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 valandЬ (AM/PM)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 valandЬ"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "SavaitКs prasideda"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Dienos ribos"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"Pasirink pradЧios ir pabaigos valandas, kurias\n"
-"nori matyti rodomas dienos ir savaitКs vaizduose.\n"
-"Laikai ne Пiose ribose Аprastai nebus rodomi."
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "Dienos pradЧia:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "Dienos pabaiga:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "Spalvos vaizdavimui"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "Rodyti TODO sЮraПe:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "TODO sЮraПo stiliaus pasirinktys:"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "ParyПkinti praКjusius punktus"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "ParyПkinti dar nereikalingus punktus"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "ParyПkinti Пiandienos punktus"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "TODO sЮraПo savybКs"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "TODO sЮraПas"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Parinktys"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "PerspКjimai"
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "PerspКjimo savybКs"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "PyptelКti vaizdo perspКjimЬ metu"
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "Garso perspКjimai baigiasi po"
-
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " sekundЧiЬ"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "Leisti uЧtildymЮ "
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "PATKPпS"
 
-#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "SPATKPп"
 
-#: camel/camel-movemail.c:96
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "NegalКjau patikrinti paПto bylos %s: %s"
-
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "NegalКjau sukurti %s uЧrakto bylos: %s"
 
-#: camel/camel-movemail.c:143
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr "BaigКsi laikas, belaukiant %s uЧrakto bylos. Bandyk vКliau."
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "NegalКjau patikrinti paПto bylos %s: %s"
+
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "NegalКjau atidaryti paПto bylos %s: %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "NegalКjau atidaryti laikinos paПto bylos %s: %s"
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "NegalКjau atikrinti %s uЧrakto bylos: %s"
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr "BaigКsi laikas, belaukiant %s uЧrakto bylos. Bandyk vКliau."
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Klaida skaitant paПto bylЮ: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Klaida АraПant laikinЮ paПto bylЮ: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nepavyko АraПyti laiПkЬ А laikinЮ bylЮ %s: %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "NegalКjau sukurti pipe: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Nepavyko programa Movemail: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(NeЧinoma klaida)"
 
@@ -2850,25 +2679,29 @@ 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:185
+#: camel/camel-remote-store.c:182
 #, c-format
 msgid "%s server %s"
 msgstr "%s serveris %s"
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:230
+#: camel/camel-remote-store.c:227
 #, 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:231
+#: camel/camel-remote-store.c:228
 msgid "(unknown host)"
 msgstr "(neЧinomas hostas)"
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -2884,22 +2717,22 @@ msgstr "URL ╔%s╢ turi bШti su hostu"
 msgid "URL '%s' needs a path component"
 msgstr "URL ╔%s╢ turi bШti su keliu"
 
-#: camel/camel-service.c:497
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr "NКra tokio hosto %s."
 
-#: camel/camel-service.c:500
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Laikinai negaliu paieПkoti %s hosto vardo."
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Protokolui ╔%s╢ nКra tiekКjo."
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2908,21 +2741,33 @@ msgstr ""
 "NegalКjau sukurti katalogo %s:\n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL eilutКje ╔%s╢ nКra protokolo"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL eilutКje ╔%s╢ yra blogas protokolas"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:154
 #, c-format
 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
+#, 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
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "NetikКtas atsakymas iП IMAP serverio: %s"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2933,16 +2778,21 @@ msgstr "NetikКtas atsakymas iП IMAP serverio: %s"
 msgid "IMAP command failed: %s"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:340
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "NeЧinoma klaida"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+#, fuzzy
+msgid "Server response ended too soon."
+msgstr "IMAP serverio atsakyme nebuvo %s informacijos"
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, 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:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NetikКtas atsakymas OK iП IMAP serverio: %s"
@@ -2952,7 +2802,7 @@ msgstr "NetikКtas atsakymas OK iП IMAP serverio: %s"
 msgid "Could not load summary for %s"
 msgstr "Nepavyko Аkelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "NegalКjau rasti laiПko teksto FETCH atsakyme"
 
@@ -2964,35 +2814,34 @@ 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:232
+#: camel/providers/imap/camel-imap-store.c:234
 #: camel/providers/nntp/camel-nntp-store.c:293
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:148
 msgid "Password"
 msgstr "SlaptaЧodis"
 
-#: camel/providers/imap/camel-imap-store.c:234
-msgid ""
-"This option will connect to the IMAP server using a plaintext password."
+#: camel/providers/imap/camel-imap-store.c:236
+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:243
+#: camel/providers/imap/camel-imap-store.c:245
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:245
+#: camel/providers/imap/camel-imap-store.c:247
 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:331
+#: camel/providers/imap/camel-imap-store.c:333
 #, 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:357
+#: camel/providers/imap/camel-imap-store.c:359
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3002,55 +2851,204 @@ msgstr ""
 "NegalКjau autentikuotis А IMAP serverА.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:537
+#: camel/providers/imap/camel-imap-store.c:539
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "NegalКjau sukurti katalogo %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:220
-msgid "Could not create summary"
-msgstr "NegalКjau sukurti santraukos"
+#: camel/providers/local/camel-local-provider.c:36
+#, fuzzy
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "UNIX MH formato paПto katalogai"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "PaПto laikymui MH tipo paПto kataloguose"
+
+#: camel/providers/local/camel-local-provider.c:47
+#, fuzzy
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX mbox formato paПto bylos"
 
-#: camel/providers/mbox/camel-mbox-folder.c:383
-#: camel/providers/mbox/camel-mbox-folder.c:386
+#: camel/providers/local/camel-local-provider.c:48
+#, fuzzy
+msgid "For storing local mail in standard mbox format"
+msgstr "PaПto laikymui MH tipo paПto kataloguose"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+#, fuzzy
+msgid "For storing local mail in qmail maildir directories"
+msgstr "PaПto laikymui MH tipo paПto kataloguose"
+
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "NegalКjau pridurti laiПko prie mbox bylos: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "╔%s╢ nКra paprasta byla."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "NegalКjau iПtrinti aplanko ╔%s╢: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:489
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Negaliu gauti laiПko: %s"
+msgid "Local mail file %s"
+msgstr "VietinК paПto byla %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX mbox formato paПto bylos"
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "NegalКjau pervadinti aplanko ╔%s╢: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "NegalКjau iПtrinti aplanko ╔%s╢: %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "NegalКjau iПtrinti aplanko ╔%s╢: %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on local "
-"disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"Skaitymui paПto, tvarkomo vietinКs sistemos, ir paПto laikymui vietiniame "
-"diske."
+"Negaliu gauti laiПko: %s\n"
+"  %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:121
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"NegalКjau atidaryti bylos ╔%s╢: \n"
+"NegalКjau atidaryti aplanko ╔%s╢: \n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:128
-#: camel/providers/mh/camel-mh-store.c:122
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "NКra tokio aplanko ╔%s╢."
 
-#: camel/providers/mbox/camel-mbox-store.c:137
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"NegalКjau sukurti aplanko: ╔%s╢:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "╔%s╢ nКra katalogas."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "NegalКjau iПtrinti aplanko ╔%s╢: %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Vietinis paПto katalogas %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Negaliu gauti laiПko: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"NegalКjau atidaryti bylos ╔%s╢: \n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3059,14 +3057,14 @@ msgstr ""
 "NegalКjau sukurti bylos ╔%s╢:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:146
-#: camel/providers/mbox/camel-mbox-store.c:180
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "╔%s╢ nКra paprasta byla."
 
-#: camel/providers/mbox/camel-mbox-store.c:172
-#: camel/providers/mbox/camel-mbox-store.c:208
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3075,151 +3073,89 @@ msgstr ""
 "NegalКjau iПtrinti aplanko ╔%s╢:\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:187
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Aplankas ╔%s╢ nКra tuПХias. NeiПtryniau."
 
-#: camel/providers/mbox/camel-mbox-store.c:225
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "NegalКjau pervadinti aplanko %s А %s: pastarasis jau yra"
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "NegalКjau atidaryti aplanko: laiПkЬ sЮraПas buvo nepilnas."
 
-#: camel/providers/mbox/camel-mbox-store.c:263
-msgid "Mbox folders may not be nested."
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:277
-#, c-format
-msgid "Local mail file %s"
-msgstr "VietinК paПto byla %s"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "NegalКjau uЧdaryti Пaltinio aplanko %s:  %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:650
-#, c-format
-msgid "Could not open summary %s"
-msgstr "NegalКjau atidaryti santraukos %s"
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+"NegalКjau atidaryti aplanko ╔%s╢: \n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:671
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "NegalКjau atidaryti laikinos paПto bylos: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:715
-msgid "Summary mismatch, aborting sync"
+#: 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
+#, fuzzy
+msgid "Summary and folder mismatch, even after a sync"
 msgstr "Santraukos nesutampa, nutraukiu sync"
 
-#: camel/providers/mbox/camel-mbox-summary.c:735
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Santrauka netinkama, trШksta X-Evolution antraПtКs"
-
-#: camel/providers/mbox/camel-mbox-summary.c:757
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Klaida raПant А laikinЮ paПto dКЧutФ: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:770
-#: camel/providers/mbox/camel-mbox-summary.c:788
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Negaliu kopijuoti duomenЬ А iПvesties bylЮ: %s"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Klaida raПant А laikinЮ paПto dКЧutФ: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:813
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "NegalКjau uЧdaryti Пaltinio aplanko %s:  %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:822
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "NegalКjau uЧdaryti laikino aplanko:  %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "NegalКjau pervadinti aplanko: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:842
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "NeЧinoma klaida: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:211
-msgid "Could not load or create summary"
-msgstr "NegalКjau Аkelti ar sukurti santraukos"
-
-#: camel/providers/mh/camel-mh-folder.c:330
-#: camel/providers/mh/camel-mh-folder.c:333
-#, c-format
-msgid "Cannot append message to mh folder: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "NegalКjau pridurti laiПko prie mh aplanko: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:399
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Negaliu gauti laiПko: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "UNIX MH formato paПto katalogai"
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "PaПto laikymui MH tipo paПto kataloguose"
-
-#: camel/providers/mh/camel-mh-store.c:115
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"NegalКjau atidaryti aplanko ╔%s╢: \n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:130
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"NegalКjau sukurti aplanko: ╔%s╢:\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:139
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "╔%s╢ nКra katalogas."
 
-#: camel/providers/mh/camel-mh-store.c:158
-#: camel/providers/mh/camel-mh-store.c:171
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "NegalКjau iПtrinti aplanko ╔%s╢: %s"
-
-#: camel/providers/mh/camel-mh-store.c:189
-#: camel/providers/mh/camel-mh-store.c:193
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "NegalКjau pervadinti aplanko ╔%s╢: %s"
-
-#: camel/providers/mh/camel-mh-store.c:197
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "NegalКjau pervadinti aplanko ╔%s╢: jau yra toks %s"
-
-#: camel/providers/mh/camel-mh-store.c:205
-msgid "MH folders may not be nested."
-msgstr ""
-
-#: camel/providers/mh/camel-mh-store.c:217
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Vietinis paПto katalogas %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3237,7 +3173,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:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "LaiПkas %s nerastas"
@@ -3288,16 +3224,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:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 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:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr "NКra laiПko su uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "NegalКjau parsiЬsti laiПko iП POP serverio %s: %s"
@@ -3311,50 +3247,50 @@ msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
-"Jungimuisi iП prie POP serveriЬ. POP protokolas taip pat gali bШti naudojamas "
-"parsiЬsti paПtui iП kai kuriЬ web paПto tiekКjЬ."
+"Jungimuisi iП prie POP serveriЬ. POP protokolas taip pat gali bШti "
+"naudojamas parsiЬsti paПtui iП kai kuriЬ web paПto tiekКjЬ."
 
-#: camel/providers/pop3/camel-pop3-store.c:154
+#: camel/providers/pop3/camel-pop3-store.c:150
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
-"пi parinktis jungsis prie POP serverio, naudojant paprasto teksto slaptaЧodА. "
-"Tai vienintelК parinktis, palaikoma daugelio POP serveriЬ."
+"пi parinktis jungsis prie POP serverio, naudojant paprasto teksto "
+"slaptaЧodА. Tai vienintelК parinktis, palaikoma daugelio POP serveriЬ."
 
-#: camel/providers/pop3/camel-pop3-store.c:164
+#: camel/providers/pop3/camel-pop3-store.c:160
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
-"the APOP protocol. This may not work for all users even on servers that claim "
-"to support it."
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
 msgstr ""
 "пi parinktis jungsis prie POP serverio, naudojant uЧПifruotЮ slaptaЧodА APOP "
 "protokolu. Tai gali veikti nevisiems vartotojams netgi serveriuose, kurie "
 "tikina, jog Пitai palaiko."
 
-#: camel/providers/pop3/camel-pop3-store.c:176
+#: camel/providers/pop3/camel-pop3-store.c:172
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 "Tai prisijungs prie POP serverio ir naudos Kerberos 4, kad autentikuotЬsi А "
 "jА."
 
-#: camel/providers/pop3/camel-pop3-store.c:221
+#: camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr "NegalКjau autentikuotis А KPOP serverА: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:339
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, 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:393
+#: camel/providers/pop3/camel-pop3-store.c:389
 #, 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:412
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3363,12 +3299,12 @@ msgstr ""
 "NegalКjau prisijungti prie POP serverio.\n"
 "Klaida siunХiant vartotojo vardЮ: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:415
-#: camel/providers/pop3/camel-pop3-store.c:452
+#: camel/providers/pop3/camel-pop3-store.c:411
+#: camel/providers/pop3/camel-pop3-store.c:448
 msgid "(Unknown)"
 msgstr "(NeЧinoma)"
 
-#: camel/providers/pop3/camel-pop3-store.c:442
+#: camel/providers/pop3/camel-pop3-store.c:438
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
@@ -3376,7 +3312,7 @@ msgstr ""
 "Negaliu prisijungti prie POP serverio.\n"
 "Jis nepalaiko norimo autentikacijos mechanizmo."
 
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3385,7 +3321,7 @@ msgstr ""
 "NegalКjau prisijungti prie POP serverio.\n"
 "Klaida siunХiant slaptaЧodА: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:557
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "NКra tokio aplanko ╔%s╢."
@@ -3452,108 +3388,107 @@ msgstr "VirtualiЬ aplankЬ paПto tiekКjas."
 msgid "For reading mail as a query of another set of folders"
 msgstr "PaПto skaitymui, kaip uЧklausa iП kitos aplankЬ aibКs."
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 baitas"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u baitЬ"
 
-#: composer/e-msg-composer-attachment-bar.c:94
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:98
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:299 mail/mail-display.c:118
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "priedas"
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Prisegti bylЮ"
 
-#: composer/e-msg-composer-attachment-bar.c:442 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/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:443
+#: composer/e-msg-composer-attachment-bar.c:465
 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:474
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Prisegti priedЮ..."
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Prisegti bylЮ prie Пio laiПko"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Priedo savybКs"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "MIME tipas:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Bylos vardas:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
-#: mail/mail-format.c:588
+#: po/tmp/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
 msgid "From:"
 msgstr "Nuo:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Paspausk Хia, jei reikia adresЬ knygelКs"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 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:300 mail/mail-format.c:601
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Kam:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "аvesk laiПko gavКjus"
 
-#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:608
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 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:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3561,15 +3496,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:318 mail/mail-format.c:613
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Tema:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "аvesk laiПko temЮ"
 
-#: composer/e-msg-composer.c:302
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3578,38 +3513,38 @@ msgstr ""
 "NegalКjau atidaryti paraПo bylos %s: \n"
 "%s"
 
-#: composer/e-msg-composer.c:458
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "IПsaugoti kaip..."
 
-#: composer/e-msg-composer.c:469
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Klaida iПsaugant bylЮ: %s"
 
-#: composer/e-msg-composer.c:489
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Klaida Аkeliant bylЮ: %s"
 
-#: composer/e-msg-composer.c:511
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "IПsaugomi laiПko pakeitimai..."
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "IПsaugoti laiПko pakeitimus..."
 
-#: composer/e-msg-composer.c:554
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Klaida saugant kШrinА А ╔JuodraПХius╢: %s"
 
-#: composer/e-msg-composer.c:598 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:604
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3619,27 +3554,27 @@ msgstr ""
 "\n"
 "Ar norКtum iПsaugoti jo pakeitimus?"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Atidaryti bylЮ"
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Tokios bylos nКra."
 
-#: composer/e-msg-composer.c:762
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Tai nКra paprasta byla."
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Byla yra, bet jos neАmanoma perskaityti."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ta byla atrodК pasiekiama, bet open(2) nepavyko."
 
-#: composer/e-msg-composer.c:804
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3647,15 +3582,15 @@ msgstr ""
 "Byla yra labai didelК (virП 100K).\n"
 "Ar tu tikrai nori jЮ Аterpti?"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "аvyko klaida, beskaitant bylЮ."
 
-#: composer/e-msg-composer.c:1197
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Sukurti laiПkЮ"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Negaliu sukurti raПyklКs lango"
 
@@ -3663,35 +3598,48 @@ msgstr "Negaliu sukurti raПyklКs lango"
 msgid "Cannot initialize Evolution's composer."
 msgstr "NegalКjau inicializuoti Evolution kШryklos."
 
-#: filter/filter-datespec.c:61
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "PaieПka"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "metЬ"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "mКnesiЬ"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "savaiХiЬ"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 msgid "days"
 msgstr "dienЬ"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "valandЬ"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minuХiЬ"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "sekundЧiЬ"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -3700,7 +3648,7 @@ msgstr ""
 "LaiПko data bus palyginta su esamu laiku, kai\n"
 "paleidЧiamas filtras ar atidaromas vAplankas."
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -3708,7 +3656,7 @@ msgstr ""
 "LaiПko data bus palyginta su laiku,\n"
 "kurА tu nurodai Хia."
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3719,29 +3667,29 @@ msgstr ""
 "pavyzdЧiui, ╔prieП savaitФ╢."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr "esamas laikas"
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr "tavo nurodytas laikas"
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr "laikas, santykinis esamam laikui"
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr "Palyginti su"
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<spausk Хia, kad pasirinktum datЮ>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:287
-#: mail/mail-autofilter.c:336
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "PridКti filtro taisyklФ"
 
@@ -3749,12 +3697,19 @@ msgstr "PridКti filtro taisyklФ"
 msgid "Edit Filter Rule"
 msgstr "Keisti filtro taisyklФ"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:456 filter/filter.glade.h:7
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr ""
+"Gaunamas\n"
+"SiunХiamas\n"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Keisti filtrus"
 
@@ -3779,19 +3734,19 @@ msgstr ""
 "Uoj, tu pamirПai pasirinkti aplankЮ.\n"
 "PraПau, grАЧk atgal ir nurodyk tikrЮ aplankЮ, А kurА perkelti laiПkus."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Parink aplankЮ"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "аvesk aplanko URI"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<spausk Хia, kad pasirinktum aplankЮ>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3800,7 +3755,12 @@ msgstr ""
 "Klaida reguliarioje iПraiПkoje ╔%s╢:\n"
 "%s"
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Testuoti"
 
@@ -3812,238 +3772,228 @@ msgstr "TaisyklКs pavadinimas:"
 msgid "Untitled"
 msgstr "BevardК"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Jei"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "аvykdyti veiksmus"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "jei visos sЮlygos tenkinamos"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "jei kuri nors sЮlyga tenkinama"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "PridКti sЮlygЮ"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "PaПalinti sЮlygЮ"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Gaunamas\n"
-"SiunХiamas\n"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Filtro taisyklКs"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Taisyti"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Taisyti vAplankus"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "Filtro taisyklКs"
+
+#: po/tmp/filter.glade.h:12
+#, fuzzy
+msgid "Incoming"
+msgstr ""
+"Gaunamas\n"
+"SiunХiamas\n"
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "KontШrai:"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "VirtualШs aplankai"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "vAplankЬ Пaltiniai"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:524
-msgid "Answered"
-msgstr "Atsakyti"
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Priskirti spalvЮ"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Priskirti АvertА"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopijuoti А aplankЮ"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Gavimo data"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Siuntimo data"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "IПtrintas"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr "JuodraПtis"
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "IПraiПka"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr "Svarbus"
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "PersiЬsti adresu"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "LaiПko tekstas"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "LaiПko tekstas"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "LaiПkas buvo gautas"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "LaiПkas buvo iПsiЬstas"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Perkelti А aplankЮ"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "GavКjai"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:521
-msgid "Seen"
-msgstr "Matytas"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "SiuntКjas"
 
-#: filter/libfilter-i18n.h:22
-msgid "Set Flag"
-msgstr "UЧdКti svarbumЮ"
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "_BШsena:"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "пaltinis"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Savita antraПtК"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "_BШsena:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdymЮ"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Tema"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "po"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "prieП"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "turi"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "neturi"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "nesibaigia"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "neegzistuoja"
 
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr "netenkina regex"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "neskamba panaПiai А"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "neprasideda"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "baigiasi"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "egzistuoja"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "yra didesnis uЧ"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "yra maЧesnis uЧ"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "nКra"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "yra"
 
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr "tenkina regex"
-
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "tuo metu arba po"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "tuo metu ar prieП"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "skamba panaПiai А"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "prasideda"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "buvo po"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "buvo prieП"
 
@@ -4067,86 +4017,164 @@ msgstr "PridКti vAplanko taisyklФ"
 msgid "Edit VFolder Rule"
 msgstr "Keisti vAplanko taisyklФ"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Negaliu inicializuoti Evolution paПto komponento."
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Negaliu inicializuoti Evolution paПto santraukos komponento."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Negaliu inicializuoti Evolution paПto laikymo hash'o."
-
-#: mail/component-factory.c:323
-#, c-format
-msgid "Bad storage URL (no server): %s"
-msgstr "Blogas laikymo URL (nКra serverio): %s"
-
-#: mail/component-factory.c:342
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "Negaliu uЧregistruoti laikmenos su shell'u"
 
-#: mail/folder-browser.c:137
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
+msgstr "IПsaugoti"
+
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "Tekstas ar tema turi"
 
-#: mail/folder-browser.c:138
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Tekstas turi"
 
-#: mail/folder-browser.c:139
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Tema turi"
 
-#: mail/folder-browser.c:140
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Tekstas neturi"
 
-#: mail/folder-browser.c:141
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Tema neturi"
 
-#: mail/folder-browser.c:142
-msgid "Custom search"
-msgstr "Kitokia paieПka"
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr "vAplankas pagal TemЮ"
 
-#: mail/folder-browser.c:314
-msgid "Custom"
-msgstr "Kitokia"
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr "vAplankas pagal SiuntКjЮ"
 
-#: mail/folder-browser.c:492
-msgid "Full Search"
-msgstr "Pilna paieПka"
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr "vAplankas pagal GavКjus"
 
-#.
-#. *  This file is autogenerated from evolution-event-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: mail/folder-browser.c:497 ui/evolution-event-editor.h:9
-msgid "Save"
-msgstr "IПsaugoti"
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr "Filtruoti pagal TemЮ"
+
+#: mail/folder-browser.c:458
+msgid "Filter on Sender"
+msgstr "Filtruoti pagal SiuntКjЮ"
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr "Filtruoti pagal GavКjus"
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr "Filtruoti pagal KonferencijЮ"
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "_Atidaryti"
+
+#: mail/folder-browser.c:466
+#, 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
+msgid "Print"
+msgstr "Spausdinti"
+
+#: mail/folder-browser.c:469
+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
+msgid "Reply to All"
+msgstr "Ats. visiems"
+
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr "PersiЬsti"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Eiti А ateities laikЮ"
+
+#: mail/folder-browser.c:474
+#, fuzzy
+msgid "Mark as Read"
+msgstr "PaЧymКti s_kaitytu"
+
+#: mail/folder-browser.c:475
+#, fuzzy
+msgid "Mark as Unread"
+msgstr "PaЧymКti _neskaityta"
+
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Perkelti А aplankЮ"
+
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Kopijuoti А aplankЮ"
+
+#: mail/folder-browser.c:480
+#, 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
+#, fuzzy
+msgid "Apply Filters"
+msgstr "_Pritaikyti filtrus"
 
-#: mail/mail-autofilter.c:76
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr "Filtruoti pagal KonferencijЮ (%s)"
+
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "LaiПkas А %s"
 
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Tema"
+
 #: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "LaiПkas nuo %s"
 
-#: mail/mail-autofilter.c:332
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencija"
 
-#: mail/mail-callbacks.c:73
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4158,7 +4186,7 @@ msgstr ""
 "gauti ir raПyti laiПkus.\n"
 "Ar norКtum sutvarkyti jА dabar?"
 
-#: mail/mail-callbacks.c:113
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4166,7 +4194,7 @@ msgstr ""
 "Tu turi susitvarkyti asmenybФ,\n"
 "tik tada galКsi kurti laiПkus."
 
-#: mail/mail-callbacks.c:127
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4174,19 +4202,19 @@ msgstr ""
 "Tu turi sutvarkyti paПto siuntimЮ,\n"
 "tik tada galКsi kurti laiПkus."
 
-#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
 msgid "You have no mail sources configured"
 msgstr "Tu neturi sutvarkytЬ paПto ПaltiniЬ"
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:213
 msgid "You have not set a mail transport method"
 msgstr "Tu nenustatei paПto siuntimo metodo"
 
-#: mail/mail-callbacks.c:221
+#: mail/mail-callbacks.c:222
 msgid "You have no Outbox configured"
 msgstr "Tu nesusitvarkei Siuntimo"
 
-#: mail/mail-callbacks.c:245
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4194,19 +4222,19 @@ msgstr ""
 "пis laiПkas neturi temos.\n"
 "Tikrai siЬsti?"
 
-#: mail/mail-callbacks.c:290
+#: mail/mail-callbacks.c:291
 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:532
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Perkelti laiПkЮ(us) А"
 
-#: mail/mail-callbacks.c:534
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Kopijuoti laiПkЮ(us) А"
 
-#: mail/mail-callbacks.c:649
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4214,7 +4242,29 @@ msgstr ""
 "Tu gali taisyti tik laiПkus, esanХius \n"
 "JuodraПХiЬ aplanke."
 
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "UЧraПyti bylЮ?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Byla tokiu vardu jau yra.\n"
+"UЧraПyti jЮ?"
+
 #: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "IПsaugoti kaip..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "IПsaugoti kaip..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4223,15 +4273,47 @@ msgstr ""
 "Klaida, Аkeliant filtro informacijЮ:\n"
 "%s"
 
-#: mail/mail-callbacks.c:793 mail/message-list.c:1574
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Spausdinti laiПkЮ"
 
-#: mail/mail-callbacks.c:840
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Nepavyko atspausdinti laiПko"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr "AsmenybК"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "PaПto Nustatymas"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "PaПto Пaltinis"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "PaПto siuntimas"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+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"
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -4241,59 +4323,63 @@ msgstr ""
 "pat gali Аvesti savo organizacijos pavadinimЮ, ir bylos vardЮ, iП kurios bus "
 "skaitomas tavo paraПas."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Pilnas vardas:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "El. paПto adresas:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "ParaПo byla:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "ParaПo byla"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Serveris:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Vartotojo vardas:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Kelias:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autentikacija:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "AtpaЧinti palaikomus tipus..."
 
-#: mail/mail-config-gui.c:967
+#: 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"
 
-#: mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Testuoti nuostatas"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "PaПto Пaltinio tipas:"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4301,17 +4387,17 @@ msgid ""
 "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"
+"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:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "NaujienЬ Пaltinio tipas:"
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4325,186 +4411,112 @@ msgstr ""
 "Jei serveris reikalauja autentikacijos, gali АvedФs kitЮ informacijЮ "
 "paspausti ╔AtpaЧinti palaikomus tipus╢ mygtukЮ."
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "PaПto siuntimo tipas:"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "PridКti asmenybФ"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "Taisyti asmenybФ"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "PridКti ПaltinА"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Keisti ПaltinА"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "PridКti naujienЬ serverА"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Keisti naujienЬ serverА"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Testuoju ╔%s╢"
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Testuoti prisijungimЮ prie ╔%s╢"
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "Prisijungimas buvo sКkmingas!"
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "UЧklausiamos ╔%s╢ autorizacijos galimybКs."
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "UЧklausti autorizacijos pas ╔%s╢"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "PaПto Nustatymas"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Sveikas atvykФs pas Evolution paПto nustatymo ЧynА!\n"
-"аraПydamas informacijЮ apie savo el. paПto nuostatas,\n"
-"iПkart galКsi pradКti siЬsti ir gauti laiПkus.\n"
-"Spausk Pirmyn, kad pratФstum."
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "AsmenybК"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "PaПto Пaltinis"
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "PaПto siuntimas"
-
-#: mail/mail-config-druid.glade.h:17
-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"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr "AsmenybКs"
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adresas"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Organizacija"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "пaltiniai"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr "AsmenybКs"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "PaПto Пaltiniai"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/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
 msgid "News Servers"
 msgstr "NaujienЬ serveriai"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "NaujienЬ Пaltiniai"
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "Organizacija"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "SiЬsti laiПkus HTML formatu"
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
-msgstr "PaЧymКti laiПkЮ skaitytu [ms]:"
-
-#: mail/mail-crypto.c:137
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "NegalКjau sukurti pipe А %s: %s"
-
-#: mail/mail-crypto.c:164
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "NegalКjau paleisti %s: %s\n"
-
-#: mail/mail-crypto.c:168
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr ""
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "пaltiniai"
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr ""
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Nepateiktas saptaЧodis."
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr ""
 
-#: mail/mail-crypto.c:600
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "NКra jokios PGP/GPG programos."
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
-msgstr "UЧraПyti bylЮ?"
-
-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Byla tokiu vardu jau yra.\n"
-"UЧraПyti jЮ?"
-
-#: mail/mail-display.c:86
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4513,122 +4525,127 @@ msgstr ""
 "NegalКjau atidaryti bylos %s: \n"
 "%s"
 
-#: mail/mail-display.c:98
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "NegalКjau АraПyti duomenЬ: %s"
 
-#: mail/mail-display.c:194
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "IПsaugoti priedЮ"
 
-#: mail/mail-display.c:234
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "NegalКjau sukurti laikino katalogo: %s"
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "IПsaugoti А diskЮ..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
 
-#: mail/mail-display.c:280
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "чiШrКti viduje"
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "IПorinК ЧiШrКklК"
 
-#: mail/mail-display.c:327
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "чiШrКti viduje (per %s)"
 
-#: mail/mail-display.c:331
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "SlКpti"
 
-#: mail/mail-format.c:477
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s priedas"
 
-#: mail/mail-format.c:594
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Atsakyti-kam:"
 
-#: mail/mail-format.c:834
+#: mail/mail-format.c:845
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr ""
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "UЧПifruotas laiПkas neparodytas"
 
-#: mail/mail-format.c:852
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "UЧПifruotas laiПkas"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Paspausk ant ikonos, kad iППifruotum."
 
-#: mail/mail-format.c:1455
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "RodyklК А FTP saitЮ (%s)"
 
-#: mail/mail-format.c:1467
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "RodyklК А vietinФ bylЮ (%s), galiojanti saite ╔%s╢"
 
-#: mail/mail-format.c:1471
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "RodyklК А vietinФ bylЮ (%s)"
 
-#: mail/mail-format.c:1505
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "RodyklК А neЧinomus iПorinius duomenis (╔%s╢ tipo)"
 
-#: mail/mail-format.c:1510
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "Blogai suformuota iПorinio kШno dalis."
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "KeiХiamas aplanko ╔%s╢ formatas А ╔%s╢"
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Pakeisti aplanko ╔%s╢ formatЮ А ╔%s╢"
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "UЧdaromas esamas aplankas"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Pervadinamas senas aplankas ir atidaromas"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Kuriamas naujas aplankas"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopijuojami laiПkai"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4637,7 +4654,7 @@ msgstr ""
 "Negaliu iПsaugoti metainfo. Tikriausiai tau daugiau\n"
 "nebepavyks atidaryti Пio aplanko: %s"
 
-#: mail/mail-local.c:443
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4645,286 +4662,306 @@ msgstr ""
 "Jei tu nebegali daugiau atidaryti Пios paПto\n"
 "dКЧutКs, tau teks sutaisyti jЮ rankutКmis."
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX neskaitytЬ)"
+#: mail/mail-local.c:781
+#, fuzzy
+msgid "Registering local folder"
+msgstr "Kuriamas naujas aplankas"
+
+#: mail/mail-local.c:783
+#, fuzzy
+msgid "Register local folder"
+msgstr "Sukurti naujЮ aplankЮ"
 
-#: mail/mail-ops.c:68
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "ParsiunХiu paПtЮ iП %s"
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "ParsiЬsti paПtЮ iП %s"
 
-#: mail/mail-ops.c:110
-#, c-format
-msgid "Retrieving messages : %s"
-msgstr "Gaunami laiПki: %s"
-
-#: mail/mail-ops.c:255
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "NКra naujЬ laiПkЬ serveryje %s."
 
-#: mail/mail-ops.c:310
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtruoju el. paПtЮ pagal praПymЮ"
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Filtruoti el. paПtЮ pagal praПymЮ"
 
-#: mail/mail-ops.c:443
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "SiunХiu ╔%s╢"
 
-#: mail/mail-ops.c:448
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "SiunХiu laiПkЮ be temos"
 
-#: mail/mail-ops.c:451
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "SiЬsti ╔%s╢"
 
-#: mail/mail-ops.c:454
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "SiЬsti laiПkЮ be temos"
 
-#: mail/mail-ops.c:625
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "SiunХiu iП eilКs"
 
-#: mail/mail-ops.c:627
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "SiЬsti iП eilКs"
 
-#: mail/mail-ops.c:763 mail/mail-ops.c:770
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Prijungiu ╔%s╢"
 
-#: mail/mail-ops.c:767 mail/mail-ops.c:773
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "Prijungiu laiПkЮ be temos"
 
-#: mail/mail-ops.c:845
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "IПvaloma ╔%s╢"
 
-#: mail/mail-ops.c:847
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "IПvalyti ╔%s╢"
 
-#: mail/mail-ops.c:906
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Perkeliami laiПkai iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:908
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopijuojami laiПkai iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:911
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Perkelti laiПkus iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:913
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopijuoti laiПkus iП ╔%s╢ А ╔%s╢"
 
-#: mail/mail-ops.c:944
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Perkeliu"
 
-#: mail/mail-ops.c:947
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopijuoju"
 
-#: mail/mail-ops.c:967
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s laiПkЮ %d iП %d (uid ╔%s╢)"
 
-#: mail/mail-ops.c:1046
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "PaЧymiu laiПkus aplanke ╔%s╢"
 
-#: mail/mail-ops.c:1049
+#: 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:1080
+#: 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:1200
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skaitomas aplankas iП ╔%s╢"
 
-#: mail/mail-ops.c:1203
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Skaityti aplankus iП ╔%s╢"
 
-#: mail/mail-ops.c:1274 mail/subscribe-dialog.c:194
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(NКra apraПymo)"
 
-#: mail/mail-ops.c:1334
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Prisegami laiПkai iП aplanko ╔%s╢"
 
-#: mail/mail-ops.c:1337
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Prisegami laiПkus iП aplanko ╔%s╢"
 
-#: mail/mail-ops.c:1440
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "PersiunХiu laiПkЮ ╔%s╢"
 
-#: mail/mail-ops.c:1445
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "PersiunХiu laiПkЮ be temos"
 
-#: mail/mail-ops.c:1448
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "PersiЬsti laiПkЮ ╔%s╢"
 
-#: mail/mail-ops.c:1453
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "PersiЬsti laiПkЮ be temos"
 
-#: mail/mail-ops.c:1490
+#: 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:1507
+#: 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:1593
+#: mail/mail-ops.c:1665
+#, 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:1595
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "аkelti ╔%s╢"
 
-#: mail/mail-ops.c:1697
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Sukuriu ╔%s╢"
 
-#: mail/mail-ops.c:1699
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Sukurti ╔%s╢"
 
-#: mail/mail-ops.c:1747
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1793
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Sinchronizuoju ╔%s╢"
 
-#: mail/mail-ops.c:1795
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Sinchronizuoti ╔%s╢"
 
-#: mail/mail-ops.c:1858
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Parodomas laiПkas UID ╔%s╢"
 
-#: mail/mail-ops.c:1861
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "IПvalomas laiПkЬ rodinys"
 
-#: mail/mail-ops.c:1864
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Parodyti laiПkЮ UID ╔%s╢"
 
-#: mail/mail-ops.c:1867
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "IПvalyti laiПkЬ rodinА"
 
-#: mail/mail-ops.c:1976
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
 
-#: mail/mail-ops.c:1979
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Atidaryti laiПkus iП ╔%s╢"
 
-#: mail/mail-ops.c:2083
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "аkeliamas %s aplankas"
 
-#: mail/mail-ops.c:2085
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "аkelti %s aplankЮ"
 
-#: mail/mail-ops.c:2152
+#: 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:2155
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "чiШrКti laiПkus iП ╔%s╢"
 
-#: mail/mail-ops.c:2181
+#: 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-search-dialogue.c:101
+#: 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:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Gaunamas laiПkas %d  iП %d (uid ╔%s╢)"
+
+#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: mail/mail-summary.c:96 mail/mail-threads.c:701
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "Nepilnas laiПkas suraПytas А pipe!"
 
-#: mail/mail-summary.c:365
-msgid "Mailbox summary"
-msgstr "PaПto dКЧutКs santrauka"
-
-#: mail/mail-threads.c:299
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4933,7 +4970,7 @@ msgstr ""
 "Klaida pasiruoПiant %s:\n"
 "%s"
 
-#: mail/mail-threads.c:648
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4942,34 +4979,34 @@ msgstr ""
 "Klaida ╔%s╢ metu:\n"
 "%s."
 
-#: mail/mail-threads.c:705
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:770
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:889
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "NegalКjau sukurti dialogo lango."
 
-#: mail/mail-threads.c:899
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "Vartotojas nutraukК uЧklausЮ."
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 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:264
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "Egzaminuoju %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -4978,46 +5015,41 @@ msgstr ""
 "laiПkЬ."
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Gaunamas laiПkas %d  iП %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "аraПomas laiПkas %d iП %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "IПsaugomi %s pakeitimai"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (persiЬstas laiПkas)"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (be temos)"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "PersiЬstas laiПkas -- %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "PersiЬstas laiПkas (be temos)"
 
-#: mail/mail-tools.c:510
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "NeЧinau protokolo, kaip atidaryti URI ╔%s╢"
-
-#: mail/mail-tools.c:539
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5030,139 +5062,112 @@ msgstr ""
 msgid "VFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 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:151 ui/evolution-mail.h:34
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: mail/mail-view.c:151 ui/evolution-mail.h:39
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Atsakyti Пio laiПko siuntКjui"
 
-#: mail/mail-view.c:154 mail/message-list.c:1577 ui/evolution-mail.h:35
-msgid "Reply to All"
-msgstr "Ats. visiems"
-
-#: mail/mail-view.c:154 ui/evolution-mail.h:38
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Atsakyti visiems Пio laiПko gavКjams"
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:19
-msgid "Forward"
-msgstr "PersiЬsti"
-
-#: mail/mail-view.c:157 ui/evolution-mail.h:20
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "PersiЬsti ПА laiПkЮ"
 
-#: mail/mail-view.c:161 ui/evolution-addressbook.h:16
-#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
-msgid "Print"
-msgstr "Spausdinti"
-
-#: mail/mail-view.c:161 ui/evolution-mail.h:33
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Spausdinti parinktЮ laiПkЮ"
 
-#: mail/mail-view.c:163 ui/evolution-mail.h:14
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "IПtrinti ПА laiПkЮ"
 
-#: mail/message-list.c:518
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:1572
-msgid "Open in New Window"
-msgstr "Atidaryti naujame lange"
-
-#: mail/message-list.c:1573
-msgid "Edit Message"
-msgstr "Taisyti laiПkЮ"
-
-#: mail/message-list.c:1576
-msgid "Reply to Sender"
-msgstr "Atsakyti siuntКjui"
-
-#: mail/message-list.c:1578
-msgid "Forward Message"
-msgstr "PersiЬsti laiПkЮ"
-
-#: mail/message-list.c:1580
-msgid "Delete Message"
-msgstr "IПtrinti laiПkЮ"
-
-#: mail/message-list.c:1581
-msgid "Move Message"
-msgstr "Perkelti laiПkЮ"
-
-#: mail/message-list.c:1582
-msgid "Copy Message"
-msgstr "Kopijuoti laiПkЮ"
+#: mail/message-list.c:575
+msgid "Seen"
+msgstr "Matytas"
 
-#: mail/message-list.c:1584
-msgid "VFolder on Subject"
-msgstr "vAplankas pagal TemЮ"
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr "Atsakyti"
 
-#: mail/message-list.c:1585
-msgid "VFolder on Sender"
-msgstr "vAplankas pagal SiuntКjЮ"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
+msgstr ""
 
-#: mail/message-list.c:1586
-msgid "VFolder on Recipients"
-msgstr "vAplankas pagal GavКjus"
+#. 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
 
-#: mail/message-list.c:1588
-msgid "Filter on Subject"
-msgstr "Filtruoti pagal TemЮ"
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "NeЧinomas"
 
-#: mail/message-list.c:1589
-msgid "Filter on Sender"
-msgstr "Filtruoti pagal SiuntКjЮ"
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
+msgstr "Perstatau laiПkЬ vaizdЮ"
 
-#: mail/message-list.c:1590
-msgid "Filter on Recipients"
-msgstr "Filtruoti pagal GavКjus"
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
+msgstr "Perstatyti laiПkЬ vaizdЮ"
 
-#: mail/message-list.c:1591 mail/message-list.c:1614
-msgid "Filter on Mailing List"
-msgstr "Filtruoti pagal KonferencijЮ"
+#: mail/subscribe-dialog.c:139
+#, fuzzy
+msgid "Display folders starting with:"
+msgstr "Rodyti aplankus, turinХius:"
 
-#: mail/message-list.c:1616
+#: mail/subscribe-dialog.c:172
 #, c-format
-msgid "Filter on Mailing List (%s)"
-msgstr "Filtruoti pagal KonferencijЮ (%s)"
+msgid "Getting store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1734
-msgid "Rebuilding message view"
-msgstr "Perstatau laiПkЬ vaizdЮ"
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1736
-msgid "Rebuild message view"
-msgstr "Perstatyti laiПkЬ vaizdЮ"
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Skaitomas aplankas iП ╔%s╢"
 
-#: mail/message-thread.c:525
-msgid "Threading message list"
-msgstr "LaiПkai skirstomi А gijas"
+#: mail/subscribe-dialog.c:286
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
 
-#: mail/message-thread.c:527
-msgid "Thread message list"
-msgstr "Suskirstyti laiПkus А gijas"
+#: mail/subscribe-dialog.c:290
+#, fuzzy, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr "Skaityti aplankus iП ╔%s╢"
 
-#: mail/subscribe-dialog.c:132
-msgid "Display folders containing:"
-msgstr "Rodyti aplankus, turinХius:"
+#: mail/subscribe-dialog.c:293
+#, fuzzy, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr "Atidaromi laiПkai iП aplanko ╔%s╢"
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Evolution Аdiegimas"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5170,28 +5175,28 @@ msgstr ""
 "пiai naujai Evolution versijai reikia Аdiegti papildomЬ bylЬ\n"
 "А tavo asmeninА Evolution katalogЮ"
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 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:152
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr "NegalКjau tvarkingai atnaujinti bylЬ"
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Evolution bylos sКkmingai Аdiegtos."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "Atrodo, kad tu pirmЮ kartЮ pasileidai Evolution."
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:188
 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:197
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5202,7 +5207,7 @@ msgstr ""
 "%s\n"
 "Klaida: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5211,7 +5216,7 @@ msgstr ""
 "Negaliu kopijuoti bylЬ А\n"
 "╔%s╢."
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5222,7 +5227,7 @@ msgstr ""
 "PraПau, perkelk jА, kad galКХiau Аdiegti\n"
 "Evolution vartotojo bylas."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5278,11 +5283,11 @@ msgstr "Bug buddy nerastas tavo kelyje ($PATH)."
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy negalКjo bШti paleistas."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5292,37 +5297,37 @@ msgstr ""
 "paПtui, kalendoriams ir kontaktЬ tvarkymui\n"
 "GNOME darbo aplinkoje."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Eiti А aplankЮ..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Joks aplankas nerodomas)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Aplankai"
 
-#: shell/e-shell-view.c:993
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution -- %s"
 
-#: shell/e-shell-view.c:1133
+#: shell/e-shell.c:372
 #, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr ""
+
+#: shell/e-shell.c:1208
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Uoj!  Vaizdas, skirtas ╔%s╢ netikКtai numirК.  :-(\n"
 "Tikriausiai tai reiПkia, kad %s komponentas nulШЧo."
 
-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr ""
-
 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
 msgstr "Sukurti naujЮ trumpiЬ grupФ"
@@ -5392,64 +5397,65 @@ msgstr "PaПalinti ПiЮ trumpФ iП trumpiЬ juostos"
 msgid "Error saving shortcuts."
 msgstr "Klaida iПsaugant trumpes."
 
-#: shell/e-storage.c:127
+#: 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
+msgid "_View"
+msgstr "_Rodinys"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Rodyti parinktЮ aplankЮ"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Be vardo)"
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "NКra klaidЬ"
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Bendroji klaida"
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Jau yra aplankas su tokiu pat vardu"
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Nurodytas aplanko tipas yra blogas"
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "I/O klaida"
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "NeuЧtenka vietos aplankui sukurti"
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Nurodytas aplankas nerastas"
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "Funkcija neАgyvendinta Пioje laikmenoje"
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "PriКjimas uЧdraustas"
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Veiksmas nepalaikomas"
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Nurodytas tipas Пioje laikmenoje nepalaikomas"
 
-#: shell/e-storage-set-view.c:223 ui/evolution-event-editor.h:91
-#: ui/evolution.h:39
-msgid "_View"
-msgstr "_Rodinys"
-
-#: shell/e-storage-set-view.c:223
-msgid "View the selected folder"
-msgstr "Rodyti parinktЮ aplankЮ"
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5471,7 +5477,7 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5479,990 +5485,1154 @@ msgstr ""
 "AХiШ\n"
 "Evolution komanda\n"
 
-#: shell/main.c:123
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "NegalКjau inicializuoti Evolution shell."
 
-#: shell/main.c:160
+#: shell/main.c:178
+#, fuzzy
+msgid "Disable."
+msgstr "UЧdraustas"
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "NegalКjau inicializuoti Bonobo komponentЬ sistemos."
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "N_aujas direktorijos serveris"
 
-#: ui/evolution-addressbook-ldap.h:10
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "_Veiksmai"
 
-#: ui/evolution-addressbook.h:10
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Sukurti naujЮ kontaktЮ"
 
-#: ui/evolution-addressbook.h:12
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "IПtrinti kontaktЮ"
 
-#: ui/evolution-addressbook.h:13 ui/evolution-event-editor.h:33
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Rasti"
 
-#: ui/evolution-addressbook.h:14
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Rasti kontaktЮ"
 
-#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Naujas"
 
-#: ui/evolution-addressbook.h:17
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Spausdinti kontaktus"
 
-#: ui/evolution-addressbook.h:18
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Stop"
 
-#: ui/evolution-addressbook.h:19
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Sustabdyti АkКlimЮ"
 
-#: ui/evolution-addressbook.h:20
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Rodyti visus"
 
-#: ui/evolution-addressbook.h:21
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Rodyti visus kontaktus"
 
-#: ui/evolution-addressbook.h:22
-msgid "_New Contact"
-msgstr "_Naujas kontaktas"
-
-#: ui/evolution-addressbook.h:23
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "S_pausdinti kontaktus..."
 
-#: ui/evolution-addressbook.h:24
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_IeПkoti kontaktЬ"
 
-#: ui/evolution-addressbook.h:25 ui/evolution-event-editor.h:113
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "аran_kiai"
 
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.h:9
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 Dienos"
 
-#: ui/evolution-calendar.h:10
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Sutvarkyti kalendoriЬ"
 
-#: ui/evolution-calendar.h:11
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Kalendorius"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Kalendoriaus nuostatos..."
 
-#: ui/evolution-calendar.h:12
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Sukurti naujЮ АvykА"
 
-#: ui/evolution-calendar.h:13
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Sukurti naujЮ kalendoriЬ"
 
-#: ui/evolution-calendar.h:14
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Diena"
 
-#: ui/evolution-calendar.h:15
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Eiti А ankstesnА laikЮ"
 
-#: ui/evolution-calendar.h:16
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Eiti А ateities laikЮ"
 
-#: ui/evolution-calendar.h:17
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "пokti"
 
-#: ui/evolution-calendar.h:18
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "пokti А nurodytЮ datЮ"
 
-#: ui/evolution-calendar.h:19
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Eiti А dabartinА laikЮ"
 
-#: ui/evolution-calendar.h:20
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "MКnesis"
 
-#: ui/evolution-calendar.h:22
-msgid "New Ca_lendar"
-msgstr "Naujas ka_lendorius"
-
-#: ui/evolution-calendar.h:23 ui/evolution-event-editor.h:45
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Pirmyn"
 
-#: ui/evolution-calendar.h:24
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Atidaryti kalendoriЬ"
 
-#: ui/evolution-calendar.h:25
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Atgal"
 
-#: ui/evolution-calendar.h:27
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Spausdinti ПА kalendoriЬ"
 
-#: ui/evolution-calendar.h:28
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Save calendar as something else"
 msgstr "_IПsaugoti kalendoriЬ kaip kaЧkЮ kitЮ"
 
-#: ui/evolution-calendar.h:29
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Rodyti 1 dienЮ"
 
-#: ui/evolution-calendar.h:30
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Rodyti 1 mКnesА"
 
-#: ui/evolution-calendar.h:31
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Rodyti 1 savaitФ"
 
-#: ui/evolution-calendar.h:32
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Rodyti darbo savaitФ"
 
-#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:331
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Dabar"
 
-#: ui/evolution-calendar.h:34
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "SavaitК"
 
-#: ui/evolution-calendar.h:35 ui/evolution.h:35
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Naujas"
 
-#: ui/evolution-calendar.h:36
-msgid "_New appointment..."
-msgstr "_Naujas Аvykis..."
-
-#: ui/evolution-calendar.h:37
-msgid "_Open"
-msgstr "_Atidaryti"
-
-#: ui/evolution-calendar.h:38
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_Atidaryti kalendoriЬ"
 
-#: ui/evolution-calendar.h:39
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "S_pausdinti ПА kalendoriЬ"
 
-#: ui/evolution-calendar.h:40
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "_IПsaugoti kalendoriЬ kaip"
 
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-event-editor.h:55
-#: ui/evolution-subscribe.h:19 ui/evolution.h:29
-msgid "_File"
-msgstr "_Byla"
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "IПtrinti ПА daiktЮ"
 
-#: ui/evolution-contact-editor.h:10 ui/evolution-event-editor.h:69
-msgid "_Save"
-msgstr "IП_saugoti"
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "IПtrinti"
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "IПsaugoti k_aip"
+#: po/tmp/evolution-contact-editor.xml.h:9
+#, fuzzy
+msgid "Help"
+msgstr "_Pagalba"
 
-#: ui/evolution-contact-editor.h:13 ui/evolution-event-editor.h:66
-msgid "_Print"
-msgstr "S_pausdinti"
+#: po/tmp/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
+msgid "Print this item"
+msgstr "Spausdinti ПА daiktЮ"
 
-#: ui/evolution-contact-editor.h:15 ui/evolution-event-editor.h:11
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/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
+msgid "Save _As..."
+msgstr "IПsaugoti _kaip..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "IПsaugoti ir uЧdaryti"
 
-#: ui/evolution-contact-editor.h:16
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "IПsaugoti kontaktЮ ir uЧdaryti dialogo langЮ"
 
-#: ui/evolution-contact-editor.h:17 ui/evolution-event-editor.h:15
-msgid "Print..."
+#: po/tmp/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
+msgid "See online help"
+msgstr "Rodyti ЧinynЮ"
+
+#: po/tmp/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
+msgid "_File"
+msgstr "_Byla"
+
+#: po/tmp/evolution-contact-editor.xml.h:20
+#, fuzzy
+msgid "_Print..."
 msgstr "Spausdinti..."
 
-#: ui/evolution-contact-editor.h:18 ui/evolution-event-editor.h:16
-msgid "Print this item"
-msgstr "Spausdinti ПА daiktЮ"
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
+msgid "_Save"
+msgstr "IП_saugoti"
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "IПtrinti ПА daiktЮ"
+#.
+#. * 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
+msgid "About this application"
+msgstr "Apie ПiЮ aplikacijЮ"
 
-#: ui/evolution-event-editor.h:10
-msgid "Save the current file"
-msgstr "IПsaugoti esamЮ bylЮ"
+#: po/tmp/evolution-event-editor.xml.h:7
+msgid "About..."
+msgstr "Apie..."
 
-#: ui/evolution-event-editor.h:12
-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:8
+msgid "Actio_ns"
+msgstr "_Veiksmai"
 
-#: ui/evolution-event-editor.h:17
-msgid "Print Setup"
-msgstr "Puslapio nuostatos"
+#: po/tmp/evolution-event-editor.xml.h:9
+msgid "C_lear"
+msgstr "IПva_lyti"
 
-#: ui/evolution-event-editor.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
+#: po/tmp/evolution-event-editor.xml.h:10
+msgid "C_ut"
+msgstr "_IПkirpti"
 
-#: ui/evolution-event-editor.h:20
-msgid "Close this appointment"
-msgstr "UЧdaryti ПА АvykА"
+#: po/tmp/evolution-event-editor.xml.h:11
+msgid "Clear"
+msgstr "IПvalyti"
 
-#: ui/evolution-event-editor.h:21
-msgid "Cut"
-msgstr "IПkirpti"
+#: po/tmp/evolution-event-editor.xml.h:12
+msgid "Clear the selection"
+msgstr "IПvalyti paЧymКjimЮ"
 
-#: ui/evolution-event-editor.h:22
-msgid "Cut the selection"
-msgstr "IПkirpti paЧymКjimЮ"
+#: po/tmp/evolution-event-editor.xml.h:14
+msgid "Close this appointment"
+msgstr "UЧdaryti ПА АvykА"
 
-#: ui/evolution-event-editor.h:23 ui/evolution-mail.h:11
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: ui/evolution-event-editor.h:24
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Kopijuoti paЧymКjimЮ"
 
-#: ui/evolution-event-editor.h:25
-msgid "Paste"
-msgstr "аdКti"
-
-#: ui/evolution-event-editor.h:26
-msgid "Paste the clipboard"
-msgstr "аdКti iП krepПio"
-
-#: ui/evolution-event-editor.h:27
-msgid "Clear"
-msgstr "IПvalyti"
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "IПkirpti"
 
-#: ui/evolution-event-editor.h:28
-msgid "Clear the selection"
-msgstr "IПvalyti paЧymКjimЮ"
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr "IПkirpti paЧymКjimЮ"
 
-#: ui/evolution-event-editor.h:29
-msgid "Undo"
-msgstr "AtПaukti"
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
 
-#: ui/evolution-event-editor.h:30
-msgid "Undo the last action"
-msgstr "AtПaukti paskutinА veiksmЮ"
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
 
-#: ui/evolution-event-editor.h:31
-msgid "Redo"
-msgstr "Pakartoti"
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr "_AdresЬ knygelК..."
 
-#: ui/evolution-event-editor.h:32
-msgid "Redo the undone action"
-msgstr "Pakartoti atПauktЮ veiksmЮ"
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr "Pasirinkti _formЮ..."
 
-#: ui/evolution-event-editor.h:34
-msgid "Search for a string"
-msgstr "IeПkoti eilutКs"
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr "_Tikrinti vardus"
 
-#: ui/evolution-event-editor.h:35
-msgid "Find Again"
-msgstr "Rasti vКl"
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Kopi_juoti А aplankЮ"
 
-#: ui/evolution-event-editor.h:36
-msgid "Search again for the same string"
-msgstr "VКl ieПkoti tos paХios eilutКs"
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
+msgstr ""
 
-#: ui/evolution-event-editor.h:37
-msgid "Replace"
-msgstr "Pakeisti"
+#: po/tmp/evolution-event-editor.xml.h:28
+msgid "FIXME: Define Print _Styles"
+msgstr "ApibrКЧti spausdinimo s_tilius"
 
-#: ui/evolution-event-editor.h:38
-msgid "Replace a string"
-msgstr "Pakeisti eilutФ"
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
 
-#: ui/evolution-event-editor.h:39
-msgid "Select All"
-msgstr "PaЧymКti visЮ"
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "_Pirmas daiktas aplanke"
 
-#: ui/evolution-event-editor.h:40
-msgid "Select everything"
-msgstr "PaЧymКti viskЮ"
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
+msgstr "Per_siЬsti"
 
-#: ui/evolution-event-editor.h:41
-msgid "Properties"
-msgstr "SavybКs"
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr "PersiЬsti kaip v_Calendar"
 
-#: ui/evolution-event-editor.h:42
-msgid "Modify the file's properties"
-msgstr "Pakeisti bylos savybes"
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr "Pagalba"
 
-#: ui/evolution-event-editor.h:43
-msgid "Previous"
-msgstr "Ankstesnis"
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr "Ne_baigta uЧduotis"
 
-#: ui/evolution-event-editor.h:44
-msgid "Go to the previous item"
-msgstr "Eiti А ankstesnА daiktЮ"
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr "аterpti bylЮ"
 
-#: ui/evolution-event-editor.h:46
-msgid "Go to the next item"
-msgstr "Eiti А tolesnА daiktЮ"
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr "_DaiktЮ..."
 
-#: ui/evolution-event-editor.h:47
-msgid "FIXME: Schedule Meeting"
-msgstr "аraПyti susitikimЮ А dienotvarkФ"
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr ""
 
-#: ui/evolution-event-editor.h:48
-msgid "Schedule some sort of a meeting"
-msgstr "аraПyti А dienotvarkФ kaЧkokА susitikimЮ"
+#: po/tmp/evolution-event-editor.xml.h:38
+msgid "FIXME: Print Pre_view"
+msgstr "Spaudinio perЧi_Шra"
 
-#: ui/evolution-event-editor.h:49
-msgid "About..."
-msgstr "Apie..."
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr "S_kelbti formЮ kaip..."
 
-#: ui/evolution-event-editor.h:50
-msgid "About this application"
-msgstr "Apie ПiЮ aplikacijЮ"
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr "_Skelbti formЮ..."
 
-#: ui/evolution-event-editor.h:51
-msgid "FIXME: Help"
-msgstr "Pagalba"
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr "Pasi_kartojimas"
 
-#: ui/evolution-event-editor.h:52
-msgid "See online help"
-msgstr "Rodyti ЧinynЮ"
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr "SiЬs_ti"
 
-#: ui/evolution-event-editor.h:53
-msgid "Dump XML"
-msgstr ""
+#: po/tmp/evolution-event-editor.xml.h:43
+msgid "FIXME: Save Attac_hments..."
+msgstr "_IПsaugoti priedus..."
 
-#: ui/evolution-event-editor.h:54
-msgid "Dump the UI Xml description"
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: ui/evolution-event-editor.h:56
-msgid "FIXME: _Mail Message"
-msgstr "_SiЬsti laiПkЮ"
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr "UЧduoties _praПymas"
 
-#: ui/evolution-event-editor.h:57
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "_Kontaktas"
 
-#: ui/evolution-event-editor.h:58
-msgid "FIXME: _Task"
-msgstr "_UЧduotis"
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr "_Prisitaikyti..."
 
-#: ui/evolution-event-editor.h:59
-msgid "FIXME: Task _Request"
-msgstr "UЧduoties _praПymas"
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr "_BylЮ..."
 
-#: ui/evolution-event-editor.h:60
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr "_пriftas..."
+
+#: po/tmp/evolution-event-editor.xml.h:50
+msgid "FIXME: _Formatting"
+msgstr "_Formatavimo"
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr "_Daiktas"
+
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr "_чurnalo АraПas"
 
-#: ui/evolution-event-editor.h:61
-msgid "FIXME: _Note"
-msgstr "_Pastaba"
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr "P_askutinis daiktas aplanke"
 
-#: ui/evolution-event-editor.h:62 ui/evolution-event-editor.h:118
-msgid "FIXME: Ch_oose Form..."
-msgstr "Pasirinkti _formЮ..."
+#: po/tmp/evolution-event-editor.xml.h:54
+msgid "FIXME: _Mail Message"
+msgstr "_SiЬsti laiПkЮ"
 
-#: ui/evolution-event-editor.h:63
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr "_Memo stilius"
 
-#: ui/evolution-event-editor.h:64
-msgid "FIXME: Define Print _Styles"
-msgstr "ApibrКЧti spausdinimo s_tilius"
-
-#: ui/evolution-event-editor.h:65
-msgid "FIXME: Print Pre_view"
-msgstr "Spaudinio perЧi_Шra"
-
-#: ui/evolution-event-editor.h:67
-msgid "Print S_etup..."
-msgstr "Spausdinimo _nuostatos...."
-
-#: ui/evolution-event-editor.h:68
-msgid "FIXME: S_end"
-msgstr "SiЬs_ti"
-
-#: ui/evolution-event-editor.h:70
-msgid "Save _As..."
-msgstr "IПsaugoti _kaip..."
-
-#: ui/evolution-event-editor.h:71
-msgid "FIXME: Save Attac_hments..."
-msgstr "_IПsaugoti priedus..."
-
-#: ui/evolution-event-editor.h:73
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "Perke_lti А aplankЮ..."
 
-#: ui/evolution-event-editor.h:74
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Kopi_juoti А aplankЮ"
-
-#: ui/evolution-event-editor.h:75
-msgid "_Properties..."
-msgstr "_SavybКs..."
+#: po/tmp/evolution-event-editor.xml.h:57
+msgid "FIXME: _New Appointment"
+msgstr "_Naujas Аvykis..."
 
-#: ui/evolution-event-editor.h:76
-msgid "_Close"
-msgstr "U_Чdaryti"
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr "_Pastaba"
 
-#: ui/evolution-event-editor.h:77 ui/evolution-subscribe.h:18
-#: ui/evolution.h:28
-msgid "_Edit"
-msgstr "_Taisa"
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr "_ObjektЮ..."
 
-#: ui/evolution-event-editor.h:78
-msgid "_Undo"
-msgstr "_AtПaukti"
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr "_Pastraipa..."
 
-#: ui/evolution-event-editor.h:79
-msgid "_Redo"
-msgstr "Paka_rtoti"
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr "_RaПyba..."
 
-#: ui/evolution-event-editor.h:80
-msgid "C_ut"
-msgstr "_IПkirpti"
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr "_StandartinК"
 
-#: ui/evolution-event-editor.h:81
-msgid "_Copy"
-msgstr "_Kopijuoti"
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr "_UЧduotis"
 
-#: ui/evolution-event-editor.h:82
-msgid "_Paste"
-msgstr "а_dКti"
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr "_Neskaitytas daiktas"
 
-#: ui/evolution-event-editor.h:83
-msgid "FIXME: Paste _Special... "
-msgstr ""
+#: po/tmp/evolution-event-editor.xml.h:65
+msgid "FIXME: what goes here?"
+msgstr "o kas Хia dabar?"
 
-#: ui/evolution-event-editor.h:84 ui/evolution-event-editor.h:85
-msgid "C_lear"
-msgstr "IПva_lyti"
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
+msgid "F_ormat"
+msgstr "F_ormatas"
 
-#: ui/evolution-event-editor.h:86
-msgid "_Find..."
-msgstr "_Rasti..."
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr "Rasti vКl"
 
-#: ui/evolution-event-editor.h:87
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Rasti _vКl"
 
-#: ui/evolution-event-editor.h:88
-msgid "_Replace..."
-msgstr "_Pakeisti..."
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr "Eiti А tolesnА daiktЮ"
 
-#: ui/evolution-event-editor.h:89
-msgid "_Object"
-msgstr "_Objektas"
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr "Eiti А ankstesnА daiktЮ"
 
-#: ui/evolution-event-editor.h:90
-msgid "FIXME: what goes here?"
-msgstr "o kas Хia dabar?"
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr "Pakeisti bylos savybes"
 
-#: ui/evolution-event-editor.h:92
+#: po/tmp/evolution-event-editor.xml.h:73
+msgid "N_ext"
+msgstr "_Tolesnis"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "аdКti"
+
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr "аdКti iП krepПio"
+
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Ankstesnis"
 
-#: ui/evolution-event-editor.h:93 ui/evolution-event-editor.h:98
-msgid "FIXME: _Item"
-msgstr "_Daiktas"
+#: po/tmp/evolution-event-editor.xml.h:78
+msgid "Previous"
+msgstr "Ankstesnis"
 
-#: ui/evolution-event-editor.h:94 ui/evolution-event-editor.h:99
-msgid "FIXME: _Unread Item"
-msgstr "_Neskaitytas daiktas"
+#: po/tmp/evolution-event-editor.xml.h:79
+msgid "Print S_etup..."
+msgstr "Spausdinimo _nuostatos...."
 
-#: ui/evolution-event-editor.h:95 ui/evolution-event-editor.h:100
-msgid "FIXME: In_complete Task"
-msgstr "Ne_baigta uЧduotis"
+#: po/tmp/evolution-event-editor.xml.h:80
+msgid "Print Setup"
+msgstr "Puslapio nuostatos"
 
-#: ui/evolution-event-editor.h:96
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "_Pirmas daiktas aplanke"
+#: po/tmp/evolution-event-editor.xml.h:83
+msgid "Properties"
+msgstr "SavybКs"
 
-#: ui/evolution-event-editor.h:97
-msgid "N_ext"
-msgstr "_Tolesnis"
+#: po/tmp/evolution-event-editor.xml.h:84
+msgid "Redo"
+msgstr "Pakartoti"
 
-#: ui/evolution-event-editor.h:101
-msgid "FIXME: _Last Item in Folder"
-msgstr "P_askutinis daiktas aplanke"
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr "Pakartoti atПauktЮ veiksmЮ"
 
-#: ui/evolution-event-editor.h:102
-msgid "_Toolbars"
-msgstr "а_rankiЬ juostos"
+#: po/tmp/evolution-event-editor.xml.h:86
+msgid "Replace"
+msgstr "Pakeisti"
 
-#: ui/evolution-event-editor.h:103
-msgid "FIXME: _Standard"
-msgstr "_StandartinК"
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr "Pakeisti eilutФ"
 
-#: ui/evolution-event-editor.h:104
-msgid "FIXME: _Formatting"
-msgstr "_Formatavimo"
+#: po/tmp/evolution-event-editor.xml.h:91
+msgid "Save the appointment and close the dialog box"
+msgstr "IПsaugoti АvykА ir uЧdaryti dialogo langЮ"
 
-#: ui/evolution-event-editor.h:105
-msgid "FIXME: _Customize..."
-msgstr "_Prisitaikyti..."
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
+msgid "Save the current file"
+msgstr "IПsaugoti esamЮ bylЮ"
 
-#: ui/evolution-event-editor.h:106
-msgid "_Insert"
-msgstr "аterpt_i"
+#: po/tmp/evolution-event-editor.xml.h:93
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "аraПyti susitikimЮ А dienotvarkФ"
 
-#: ui/evolution-event-editor.h:107
-msgid "FIXME: _File..."
-msgstr "_BylЮ..."
+#: po/tmp/evolution-event-editor.xml.h:94
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "аtraukti s_usitikimЮ А dienotvarkФ"
 
-#: ui/evolution-event-editor.h:108
-msgid "FIXME: It_em..."
-msgstr "_DaiktЮ..."
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr "аraПyti А dienotvarkФ kaЧkokА susitikimЮ"
 
-#: ui/evolution-event-editor.h:109
-msgid "FIXME: _Object..."
-msgstr "_ObjektЮ..."
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr "VКl ieПkoti tos paХios eilutКs"
 
-#: ui/evolution-event-editor.h:110
-msgid "F_ormat"
-msgstr "F_ormatas"
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr "IeПkoti eilutКs"
 
-#: ui/evolution-event-editor.h:111
-msgid "FIXME: _Font..."
-msgstr "_пriftas..."
+#: po/tmp/evolution-event-editor.xml.h:99
+msgid "Select All"
+msgstr "PaЧymКti visЮ"
 
-#: ui/evolution-event-editor.h:112
-msgid "FIXME: _Paragraph..."
-msgstr "_Pastraipa..."
+#: po/tmp/evolution-event-editor.xml.h:100
+msgid "Select everything"
+msgstr "PaЧymКti viskЮ"
 
-#: ui/evolution-event-editor.h:114
-msgid "FIXME: _Spelling..."
-msgstr "_RaПyba..."
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr "Nustatyti puslapio parinktis tavo esamam spausdintuvui"
 
-#: ui/evolution-event-editor.h:115
-msgid "FIXME: Chec_k Names"
-msgstr "_Tikrinti vardus"
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr "AtПaukti"
 
-#: ui/evolution-event-editor.h:116
-msgid "FIXME: Address _Book..."
-msgstr "_AdresЬ knygelК..."
+#: po/tmp/evolution-event-editor.xml.h:103
+msgid "Undo the last action"
+msgstr "AtПaukti paskutinА veiksmЮ"
 
-#: ui/evolution-event-editor.h:117
-msgid "_Forms"
-msgstr "_Formos"
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
+msgid "_About..."
+msgstr "_Apie..."
 
-#: ui/evolution-event-editor.h:119
-msgid "FIXME: Desi_gn This Form"
-msgstr ""
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+msgid "_Close"
+msgstr "U_Чdaryti"
 
-#: ui/evolution-event-editor.h:120
-msgid "FIXME: D_esign a Form..."
-msgstr ""
+#: po/tmp/evolution-event-editor.xml.h:106
+msgid "_Copy"
+msgstr "_Kopijuoti"
 
-#: ui/evolution-event-editor.h:121
-msgid "FIXME: Publish _Form..."
-msgstr "_Skelbti formЮ..."
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
+msgid "_Debug"
+msgstr "_Derinti"
 
-#: ui/evolution-event-editor.h:122
-msgid "FIXME: Pu_blish Form As..."
-msgstr "S_kelbti formЮ kaip..."
+#: 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
+msgid "_Edit"
+msgstr "_Taisa"
 
-#: ui/evolution-event-editor.h:123
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#: po/tmp/evolution-event-editor.xml.h:111
+msgid "_Find..."
+msgstr "_Rasti..."
 
-#: ui/evolution-event-editor.h:124
-msgid "Actio_ns"
-msgstr "_Veiksmai"
+#: po/tmp/evolution-event-editor.xml.h:112
+msgid "_Forms"
+msgstr "_Formos"
 
-#: ui/evolution-event-editor.h:125
-msgid "FIXME: _New Appointment"
-msgstr "_Naujas Аvykis..."
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+msgid "_Help"
+msgstr "_Pagalba"
 
-#: ui/evolution-event-editor.h:126
-msgid "FIXME: Rec_urrence..."
-msgstr "Pasi_kartojimas"
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr "аterpt_i"
 
-#: ui/evolution-event-editor.h:127
-msgid "FIXME: Schedule _Meeting"
-msgstr "аtraukti s_usitikimЮ А dienotvarkФ"
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr "_Objektas"
 
-#: ui/evolution-event-editor.h:128
-msgid "FIXME: Forward as v_Calendar"
-msgstr "PersiЬsti kaip v_Calendar"
+#: po/tmp/evolution-event-editor.xml.h:116
+msgid "_Paste"
+msgstr "а_dКti"
 
-#: ui/evolution-event-editor.h:129
-msgid "FIXME: For_ward"
-msgstr "Per_siЬsti"
+#: po/tmp/evolution-event-editor.xml.h:117
+msgid "_Print"
+msgstr "S_pausdinti"
 
-#: ui/evolution-event-editor.h:130 ui/evolution.h:32
-msgid "_Help"
-msgstr "_Pagalba"
+#: po/tmp/evolution-event-editor.xml.h:118
+msgid "_Properties..."
+msgstr "_SavybКs..."
 
-#: ui/evolution-event-editor.h:131
-msgid "_About..."
-msgstr "_Apie..."
+#: po/tmp/evolution-event-editor.xml.h:119
+msgid "_Redo"
+msgstr "Paka_rtoti"
 
-#: ui/evolution-event-editor.h:132
-msgid "_Debug"
-msgstr "_Derinti"
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr "_Pakeisti..."
 
-#: ui/evolution-event-editor.h:133
-msgid "FIXME: Insert File"
-msgstr "аterpti bylЮ"
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
+msgstr "а_rankiЬ juostos"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
+msgstr "_AtПaukti"
 
 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.h:9
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Sukurti"
 
-#: ui/evolution-mail.h:10
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Sukurti naujЮ laiПkЮ"
 
-#: ui/evolution-mail.h:12
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Kopijuoti laiПkЮ А naujЮ aplankЮ"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "_Aplankas"
 
-#: ui/evolution-mail.h:16
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Fi_ltruoti pagal SiuntКjЮ"
 
-#: ui/evolution-mail.h:17
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtruoti pagal _GavКjus"
 
-#: ui/evolution-mail.h:18
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Pa_mirПti slaptaЧodЧius"
 
-#: ui/evolution-mail.h:21
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Gauti paПtЮ"
 
-#: ui/evolution-mail.h:22
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "PaПto _filtrai..."
 
-#: ui/evolution-mail.h:23
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
 msgstr "Tvarkyti uЧsakymus..."
 
-#: ui/evolution-mail.h:24
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "PaЧymКti s_kaitytu"
 
-#: ui/evolution-mail.h:25
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "PaЧymКti _neskaityta"
 
-#: ui/evolution-mail.h:26
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Perkelti"
 
-#: ui/evolution-mail.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
 
-#: ui/evolution-mail.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "PerЧiШrКti laiПkЮ prieП spausdinant"
 
-#: ui/evolution-mail.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "LaiПko spaudinio perЧiШra..."
 
-#: ui/evolution-mail.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Spausdinti laiПkЮ spausdintuvu"
 
-#: ui/evolution-mail.h:32
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Spausdinti laiПkЮ..."
 
-#: ui/evolution-mail.h:36
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: ui/evolution-mail.h:37
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Atsakyti _siuntКjui"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "PaЧymКti _viskЮ"
 
-#: ui/evolution-mail.h:41
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "IПsiЬsti laukianti АaПtЮ ir parsiЬsti naujЮ paПtЮ"
 
-#: ui/evolution-mail.h:42
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Gijomis suskirstytas laiПkЬ sЮraПas"
 
-#: ui/evolution-mail.h:43
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_ntКjЮ"
 
-#: ui/evolution-mail.h:44
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _GavКjus"
 
-#: ui/evolution-mail.h:45
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "_Pritaikyti filtrus"
 
-#: ui/evolution-mail.h:46
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "_Tvarkyti aplankЮ"
 
-#: ui/evolution-mail.h:47
-msgid "_Copy to Folder"
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
 msgstr "_Kopijuoti А aplankЮ"
 
-#: ui/evolution-mail.h:49
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "_Taisyti laiПkЮ"
 
-#: ui/evolution-mail.h:50
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "IП_tuПtinti"
 
-#: ui/evolution-mail.h:51
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "_Filtruoti pagal TemЮ"
 
-#: ui/evolution-mail.h:52
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "_PersiЬsti"
 
-#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Invertuoti paЧymКjimЮ"
 
-#: ui/evolution-mail.h:54
-msgid "_Mail Configuration..."
-msgstr "_PaПto nustatymas...."
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "PaПto Nustatymas"
 
-#: ui/evolution-mail.h:55
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_LaiПkas"
 
-#: ui/evolution-mail.h:56
-msgid "_Move to Folder"
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
 msgstr "_Perkelti А aplankЮ"
 
-#: ui/evolution-mail.h:57
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "_Atidaryti naujame lange"
 
-#: ui/evolution-mail.h:58
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "_Spausdinti laiПkЮ"
 
-#: ui/evolution-mail.h:59
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "IПsaugoti kaip..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "пaltinis"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "_Gijomis"
 
-#: ui/evolution-mail.h:60
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "_IПtrinti"
+
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "_vAplankas pagal TemЮ"
 
-#: ui/evolution-mail.h:61
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "_VirtualiЬ aplankЬ taisiklis..."
 
 #.
-#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.h:9
+#: po/tmp/evolution-message-composer.xml.h:6
+#, fuzzy
+msgid "Attach"
+msgstr "Prisegti bylЮ"
+
+#: po/tmp/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
+msgid "HTML"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:12
+#, 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
+msgid "Insert text file..."
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "Atidaryti bylЮ"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "IПsaugoti k_aip"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save in _folder... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Eiti А aplankЮ..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save the current file with a different name"
+msgstr "IПsaugoti esamЮ bylЮ"
+
+#: po/tmp/evolution-message-composer.xml.h:23
+#, fuzzy
+msgid "Save the message in a specified folder"
+msgstr "Perkelti laiПkЮ А naujЮ aplankЮ"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send"
+msgstr "SiuntКjas"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "SiuntКjas"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "SiuntКjas"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "SiЬsti laiПkus HTML formatu"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Suskirstyti laiПkus А gijas"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "SiЬsti laiПkus HTML formatu"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "IПtrinti ПА laiПkЮ"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "IПsaugoti priedЮ"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show _attachments"
+msgstr "priedas"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "priedas"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "Atidaryti..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "PridКti aplankЮ А uЧsakytЬ aplankЬ sЮraПЮ"
 
-#: ui/evolution-subscribe.h:12
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Atnaujinti sЮraПЮ"
 
-#: ui/evolution-subscribe.h:13
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Atnaujinti aplankЬ sЮraПЮ"
 
-#: ui/evolution-subscribe.h:14
+#: po/tmp/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"
 
-#: ui/evolution-subscribe.h:16
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "UЧsakyti"
 
-#: ui/evolution-subscribe.h:17
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Atsisakyti"
 
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.h:9
-msgid "Create a new folder"
-msgstr "Sukurti naujЮ aplankЮ"
-
-#: ui/evolution.h:10
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Parodyti kitЮ aplankЮ"
 
-#: ui/evolution.h:11
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "I_Пeiti"
 
-#: ui/evolution.h:12
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution juostos _trumpК"
 
-#: ui/evolution.h:13
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "IПeiti iП programos"
 
-#: ui/evolution.h:14
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "_SusipaЧinimas"
 
-#: ui/evolution.h:15
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Parodyti informacijЮ apie Evolution"
 
-#: ui/evolution.h:16
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Rodyti _AplankЬ juostЮ"
 
-#: ui/evolution.h:17
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Rodyti _TrumpiЬ juostЮ"
 
-#: ui/evolution.h:18
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "IП_siЬsti klaidos praneПimЮ"
+
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
 msgstr "PraneПti apie klaidЮ, naudojant Bug Buddy"
 
-#: ui/evolution.h:19
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Perjungti, ar rodyti aplankЬ juostЮ"
 
-#: ui/evolution.h:20
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Perjungti, ar rodyti trumpiЬ juostЮ"
 
-#: ui/evolution.h:21
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "K_ontaktЬ menedЧerio naudojimas"
 
-#: ui/evolution.h:22
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "_Kalendoriaus vartojimas"
 
-#: ui/evolution.h:23
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "PaПto programos naudojimas"
 
-#: ui/evolution.h:24
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Apie Evolution..."
 
-#: ui/evolution.h:25
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "а_vykis"
 
-#: ui/evolution.h:26
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontaktas"
 
-#: ui/evolution.h:27
-msgid "_Create New Folder..."
-msgstr "_Sukurti naujЮ aplankЮ..."
-
-#: ui/evolution.h:30
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Aplankas"
 
-#: ui/evolution.h:31
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Eiti А aplankЮ..."
 
-#: ui/evolution.h:33
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Turinys"
 
-#: ui/evolution.h:34
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_PaПto laiПkas"
 
-#: ui/evolution.h:36
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Nuostatos"
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "IП_siЬsti klaidos praneПimЮ"
-
-#: ui/evolution.h:38
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Bandymas"
@@ -6539,13 +6709,6 @@ msgstr "Susitikimo pa_baigos laikas:"
 msgid "All Attendees"
 msgstr "Visi dalyviai"
 
-#. 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:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6555,21 +6718,19 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:325
+#: widgets/misc/e-dateedit.c:408
 msgid "Now"
 msgstr "Dabar"
 
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
-#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
-#: widgets/misc/e-dateedit.c:1127
+#. 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
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
-#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
-#: widgets/misc/e-dateedit.c:1130
+#. 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
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -6578,3 +6739,263 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "GrupК %i"
 
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Ar tikrai nori iПtrinti \n"
+#~ "ПА kontaktЮ?"
+
+#~ msgid "Quick Search"
+#~ msgstr "Greita paieПka"
+
+#~ msgid "window2"
+#~ msgstr "window2"
+
+#~ msgid "Recur on the"
+#~ msgstr "Atsitikti"
+
+#~ msgid "th day of the month"
+#~ msgstr "-ЮjЮ mКnesio dienЮ"
+
+#~ msgid ""
+#~ "This appointment has custom recurrence rules that cannot be edited by "
+#~ "Evolution.\n"
+#~ "\n"
+#~ "However, the appointment will recur at the appropriate time and will be "
+#~ "displayed properly in the calendar views."
+#~ msgstr ""
+#~ "пis Аvykis turi kitokias pakartojimo taisykles, kuriЬ tu negali pakeisti su "
+#~ "Evolution.\n"
+#~ "\n"
+#~ "Vis tik, Аvykis pasikartos reikiamu laiku ir bus teisingai parodytas "
+#~ "kalendoriaus vaizduose."
+
+#~ msgid "Create to-do item"
+#~ msgstr "Sukurti to-do punktЮ"
+
+#~ msgid "Edit to-do item"
+#~ msgstr "Keisti to-do punktЮ"
+
+#~ msgid "Summary:"
+#~ msgstr "Santrauka:"
+
+#~ msgid "Due Date:"
+#~ msgstr "Kada reikia:"
+
+#~ msgid "Priority:"
+#~ msgstr "Svarbumas:"
+
+#~ msgid "Item Comments:"
+#~ msgstr "Daikto komentarai:"
+
+#~ msgid "Time display"
+#~ msgstr "Laiko rodymas"
+
+#~ msgid "Time format"
+#~ msgstr "Laiko formatas"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 valandЬ (AM/PM)"
+
+#~ msgid "24-hour"
+#~ msgstr "24 valandЬ"
+
+#~ msgid "Weeks start on"
+#~ msgstr "SavaitКs prasideda"
+
+#~ msgid "Day range"
+#~ msgstr "Dienos ribos"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "Pasirink pradЧios ir pabaigos valandas, kurias\n"
+#~ "nori matyti rodomas dienos ir savaitКs vaizduose.\n"
+#~ "Laikai ne Пiose ribose Аprastai nebus rodomi."
+
+#~ msgid "Day start:"
+#~ msgstr "Dienos pradЧia:"
+
+#~ msgid "Day end:"
+#~ msgstr "Dienos pabaiga:"
+
+#~ msgid "Colors for display"
+#~ msgstr "Spalvos vaizdavimui"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "Rodyti TODO sЮraПe:"
+
+#~ msgid "To Do List style options:"
+#~ msgstr "TODO sЮraПo stiliaus pasirinktys:"
+
+#~ msgid "Highlight overdue items"
+#~ msgstr "ParyПkinti praКjusius punktus"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "ParyПkinti dar nereikalingus punktus"
+
+#~ msgid "Highlight items due today"
+#~ msgstr "ParyПkinti Пiandienos punktus"
+
+#~ msgid "To Do List Properties"
+#~ msgstr "TODO sЮraПo savybКs"
+
+#~ msgid "To Do List"
+#~ msgstr "TODO sЮraПas"
+
+#~ msgid "Preferences"
+#~ msgstr "Parinktys"
+
+#~ msgid "Alarms"
+#~ msgstr "PerspКjimai"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "PerspКjimo savybКs"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "PyptelКti vaizdo perspКjimЬ metu"
+
+#~ msgid "Audio alarms timeout after"
+#~ msgstr "Garso perspКjimai baigiasi po"
+
+#~ msgid " seconds"
+#~ msgstr " sekundЧiЬ"
+
+#~ msgid "Enable snoozing for "
+#~ msgstr "Leisti uЧtildymЮ "
+
+#~ msgid "Could not create summary"
+#~ msgstr "NegalКjau sukurti santraukos"
+
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Negaliu gauti laiПko: %s"
+
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Skaitymui paПto, tvarkomo vietinКs sistemos, ir paПto laikymui vietiniame "
+#~ "diske."
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "NegalКjau pervadinti aplanko %s А %s: pastarasis jau yra"
+
+#~ msgid "Could not open summary %s"
+#~ msgstr "NegalКjau atidaryti santraukos %s"
+
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Santrauka netinkama, trШksta X-Evolution antraПtКs"
+
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Negaliu kopijuoti duomenЬ А iПvesties bylЮ: %s"
+
+#~ msgid "Could not load or create summary"
+#~ msgstr "NegalКjau Аkelti ar sukurti santraukos"
+
+#~ 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"
+
+#~ msgid "Flagged"
+#~ msgstr "Svarbus"
+
+#~ msgid "Set Flag"
+#~ msgstr "UЧdКti svarbumЮ"
+
+#~ msgid "does not match regex"
+#~ msgstr "netenkina regex"
+
+#~ 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."
+
+#~ msgid "Bad storage URL (no server): %s"
+#~ msgstr "Blogas laikymo URL (nКra serverio): %s"
+
+#~ msgid "Custom search"
+#~ msgstr "Kitokia paieПka"
+
+#~ msgid "Custom"
+#~ msgstr "Kitokia"
+
+#~ msgid "Full Search"
+#~ msgstr "Pilna paieПka"
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail configuration wizard!\n"
+#~ "By filling in some information about your email\n"
+#~ "settings, you can start sending and receiving email\n"
+#~ "right away. Click Next to continue."
+#~ msgstr ""
+#~ "Sveikas atvykФs pas Evolution paПto nustatymo ЧynА!\n"
+#~ "аraПydamas informacijЮ apie savo el. paПto nuostatas,\n"
+#~ "iПkart galКsi pradКti siЬsti ir gauti laiПkus.\n"
+#~ "Spausk Pirmyn, kad pratФstum."
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "NegalКjau sukurti pipe А %s: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "NegalКjau paleisti %s: %s\n"
+
+#~ 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Ю"
+
+#~ msgid "Copy Message"
+#~ msgstr "Kopijuoti laiПkЮ"
+
+#~ 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 994a42430b..b88731507c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution CVS\n"
-"POT-Creation-Date: 2000-12-02 13:59+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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 +320,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:1006
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1127
-#: calendar/conduits/todo/todo-conduit.c:938 calendar/gui/main.c:54
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kon Bonobo niet initialiseren"
 
@@ -444,28 +444,28 @@ 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:196
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "Cursor kon niet worden geladen\n"
 
-#: addressbook/conduit/address-conduit.c:209
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EBook niet geladen\n"
 
-#: addressbook/conduit/address-conduit.c:598
-#: calendar/conduits/calendar/calendar-conduit.c:710
-#: calendar/conduits/todo/todo-conduit.c:520
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Kon \"wombat\" server niet starten"
 
-#: addressbook/conduit/address-conduit.c:599
-#: calendar/conduits/calendar/calendar-conduit.c:711
-#: calendar/conduits/todo/todo-conduit.c:521
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Kon \"wombat\" niet starten"
 
-#: addressbook/conduit/address-conduit.c:631
-#: addressbook/conduit/address-conduit.c:634
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "Kon het adres applicatie blok niet uit de pilot lezen"
 
@@ -489,125 +489,6 @@ msgstr "Item(s) die tot deze categorie behoren:"
 msgid "Available Categories:"
 msgstr "Beschikbare CategorieКn:"
 
-# addressbook/contact-editor/e-contact-editor.c:1278

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-# 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
-msgid "Primary Email"
-msgstr "Primaire E-mail"
-
-# addressbook/contact-editor/e-contact-editor.c:1341

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

-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "E-mail 3"
-
 # addressbook/gui/component/addressbook.c:426

 #.
 #. * Translatable strings file generated by extract-ui.
@@ -702,6 +583,13 @@ msgstr "Bedrijfs _Fax"
 msgid "_Mobile"
 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
+msgid "Primary Email"
+msgstr "Primaire E-mail"
+
 # addressbook/contact-editor/e-contact-editor-strings.h:24

 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
@@ -800,6 +688,118 @@ msgstr "Aa_ntekeningen:"
 msgid "Details"
 msgstr "Details"
 
+# addressbook/contact-editor/e-contact-editor.c:1278

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+# addressbook/contact-editor/e-contact-editor.c:1341

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

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

 #.
 #. * Translatable strings file generated by extract-ui.
@@ -921,7 +921,7 @@ msgid "_Suffix:"
 msgstr "Achtervoeg_sel:"
 
 # addressbook/gui/component/addressbook.c:1046

-#: addressbook/gui/component/addressbook.c:266
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Als _Minikaarten"
 
@@ -931,18 +931,18 @@ msgstr "Als _Minikaarten"
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:272
+#: addressbook/gui/component/addressbook.c:269
 #: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Als _Tabel"
 
 # addressbook/gui/component/addressbook.c:593

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

-#: addressbook/gui/component/addressbook.c:397
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -962,34 +962,34 @@ msgstr ""
 "OpenLDAP downloaden en installeren en Evolution hercompileren\n"
 "en opnieuw installeren.\n"
 
-#: addressbook/gui/component/addressbook.c:507 mail/folder-browser.c:152
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 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:509 mail/folder-browser.c:154
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr "Geavanceerd..."
 
-#: addressbook/gui/component/addressbook.c:539
+#: addressbook/gui/component/addressbook.c:533
 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:540
+#: addressbook/gui/component/addressbook.c:534
 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:541
+#: addressbook/gui/component/addressbook.c:535
 msgid "Email contains"
 msgstr "E-mail bevat"
 
 # addressbook/gui/component/addressbook.c:1097

-#: addressbook/gui/component/addressbook.c:627
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "De URI die de Map Bladeraar zal laten zien"
 
@@ -1051,6 +1051,12 @@ msgstr "Selecteer namen"
 msgid "Select name from List:"
 msgstr "Selecteer naam uit lijst:"
 
+# composer/e-msg-composer-address-dialog.glade.h:9

+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Zoeken"
+
 # addressbook/gui/component/alphabet.glade.h:8

 #.
 #. * Translatable strings file generated by extract-ui.
@@ -1193,7 +1199,7 @@ msgstr "z"
 
 # addressbook/gui/component/addressbook.c:943

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

-#: addressbook/gui/widgets/e-addressbook-view.c:415
+#: addressbook/gui/widgets/e-addressbook-view.c:417
 #: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Opslaan als VCard"
@@ -1218,12 +1224,6 @@ msgstr ""
 "\n"
 "Dubbelklik hier om een nieuw Contact te maken."
 
-# composer/e-msg-composer-address-dialog.glade.h:9

-#: addressbook/gui/search/e-addressbook-search-dialog.c:147
-#: mail/mail-search-dialogue.c:104
-msgid "Search"
-msgstr "Zoeken"
-
 # addressbook/printing/e-contact-print.glade.h:23

 #.
 #. * Translatable strings file generated by extract-ui.
@@ -1448,15 +1448,15 @@ 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:538
-#: calendar/gui/e-week-view.c:287 calendar/gui/print.c:605
+#: 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:541
-#: calendar/gui/e-week-view.c:290 calendar/gui/print.c:604
+#: 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"
 
@@ -1468,13 +1468,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:666
-#: calendar/conduits/todo/todo-conduit.c:476
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Fout tijdens communiceren met kalender server"
 
-#: calendar/conduits/calendar/calendar-conduit.c:765
-#: calendar/conduits/calendar/calendar-conduit.c:768
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Kon het Kalender applicatie blok niet uit de pilot lezen"
 
@@ -1487,8 +1487,8 @@ 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:575
 #: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon het to-do applicatie blok niet uit de pilot lezen"
 
@@ -1561,7 +1561,7 @@ msgstr "Kalender opslaan"
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
 msgstr "%a %d-%m-%Y"
 
@@ -1706,7 +1706,7 @@ msgstr "Geen samenvatting beschikbaar."
 #.
 #: 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:9
+#: po/tmp/evolution-message-composer.xml.h:8
 #: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Sluiten"
@@ -1835,7 +1835,7 @@ msgid "Fri"
 msgstr "Vrij"
 
 # calendar/gui/getdate.y:413

-#: calendar/gui/event-editor.c:419 po/tmp/cal-prefs-dialog.glade.h:28
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
 msgid "Friday"
 msgstr "Vrijdag"
 
@@ -1867,7 +1867,7 @@ msgid "Mon"
 msgstr "Maa"
 
 # calendar/gui/prop.c:348

-#: calendar/gui/event-editor.c:415 po/tmp/cal-prefs-dialog.glade.h:35
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
 msgid "Monday"
 msgstr "Maandag"
 
@@ -1886,7 +1886,7 @@ msgstr "Kies een kleur"
 
 # calendar/gui/gncal-todo.c:427 calendar/gui/prop.c:605

 # mail/message-list.c:474

-#: filter/libfilter-i18n.h:16 po/tmp/cal-prefs-dialog.glade.h:39
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Prioriteit"
 
@@ -1906,7 +1906,7 @@ msgid "Sat"
 msgstr "Zat"
 
 # calendar/gui/getdate.y:414

-#: calendar/gui/event-editor.c:420 po/tmp/cal-prefs-dialog.glade.h:43
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
 msgid "Saturday"
 msgstr "Zaterdag"
 
@@ -1936,7 +1936,7 @@ msgid "Sun"
 msgstr "Zon"
 
 # calendar/gui/prop.c:347

-#: calendar/gui/event-editor.c:421 po/tmp/cal-prefs-dialog.glade.h:49
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
 msgid "Sunday"
 msgstr "Zondag"
 
@@ -1950,7 +1950,7 @@ msgid "Thu"
 msgstr "Don"
 
 # calendar/gui/getdate.y:410

-#: calendar/gui/event-editor.c:418 po/tmp/cal-prefs-dialog.glade.h:52
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
 msgid "Thursday"
 msgstr "Donderdag"
 
@@ -1975,7 +1975,7 @@ msgid "Tue"
 msgstr "Din"
 
 # calendar/gui/getdate.y:406

-#: calendar/gui/event-editor.c:416 po/tmp/cal-prefs-dialog.glade.h:57
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
 msgid "Tuesday"
 msgstr "Dinsdag"
 
@@ -1990,7 +1990,7 @@ msgid "Wed"
 msgstr "Woe"
 
 # calendar/gui/getdate.y:408

-#: calendar/gui/event-editor.c:417 po/tmp/cal-prefs-dialog.glade.h:60
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
 msgid "Wednesday"
 msgstr "Woensdag"
 
@@ -2008,33 +2008,6 @@ msgstr "minuten voor ze plaatsvinden."
 msgid "seconds."
 msgstr "seconden."
 
-#: calendar/gui/dialogs/task-editor.c:656
-msgid "Edit Task"
-msgstr "Taak Bewerken"
-
-# calendar/gui/event-editor.c:294

-#: calendar/gui/dialogs/task-editor.c:662 calendar/gui/event-editor.c:319
-msgid "No summary"
-msgstr "Geen opsomming"
-
-# calendar/gui/event-editor.c:298

-#: calendar/gui/dialogs/task-editor.c:668 calendar/gui/event-editor.c:325
-#, c-format
-msgid "Appointment - %s"
-msgstr "Afspraak - %s"
-
-# calendar/gui/event-editor.c:301

-#: calendar/gui/dialogs/task-editor.c:671 calendar/gui/event-editor.c:328
-#, c-format
-msgid "Task - %s"
-msgstr "Taak - %s"
-
-# calendar/gui/event-editor.c:304

-#: calendar/gui/dialogs/task-editor.c:674 calendar/gui/event-editor.c:331
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Dagboek Item - %s"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -2079,7 +2052,7 @@ 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:1018
+#: 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
 msgid "None"
@@ -2135,27 +2108,60 @@ msgstr "_Status:"
 msgid "task-editor-dialog"
 msgstr "taak-bewerkings-dialoogvenster"
 
-#: calendar/gui/e-calendar-table.c:328
+#: calendar/gui/dialogs/task-editor.c:681
+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
+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
+#, 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
+#, 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
+#, 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
+#, fuzzy
+msgid "Do you want to save changes?"
+msgstr "Bezig met voorbereiden van wijzingen opslaan aan bericht..."
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "_Openen"
 
-#: calendar/gui/e-calendar-table.c:329
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Open de taak"
 
-#: calendar/gui/e-calendar-table.c:331
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Markeer als Gedaan"
 
-#: calendar/gui/e-calendar-table.c:332
+#: calendar/gui/e-calendar-table.c:340
 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:334 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:493 mail/mail-view.c:165
+#: 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
@@ -2164,7 +2170,7 @@ 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:335
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Verwijder de taak"
 
@@ -2177,7 +2183,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:1196
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %d %B"
@@ -2185,14 +2191,14 @@ 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:1210
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1223
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
@@ -2200,37 +2206,37 @@ msgstr "%d %b"
 # 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:2931 calendar/gui/e-day-view.c:2938
-#: calendar/gui/e-day-view.c:2947 calendar/gui/e-week-view.c:3164
-#: calendar/gui/e-week-view.c:3171 calendar/gui/e-week-view.c:3180
+#: 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
 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:2935 calendar/gui/e-day-view.c:2942
-#: calendar/gui/e-week-view.c:3168 calendar/gui/e-week-view.c:3175
+#: 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
 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:2936 calendar/gui/e-week-view.c:3169
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
 #: po/tmp/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:2943 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 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:2944 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 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:2945 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Verwijder alle gebeurtenissen"
 
@@ -2241,59 +2247,6 @@ msgstr "Verwijder alle gebeurtenissen"
 msgid "%d %B"
 msgstr "%d %B"
 
-# calendar/gui/event-editor.c:289

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

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

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

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

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

-#: calendar/gui/event-editor.c:700
-msgid "occurrences"
-msgstr "gebeurtenissen"
-
-#: calendar/gui/event-editor.c:817
-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:2889 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -2472,6 +2425,47 @@ msgstr "week(en)"
 msgid "year(s)"
 msgstr "jar(en)"
 
+# calendar/gui/event-editor.c:289

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

+#: calendar/gui/event-editor.c:407
+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
+msgid "day"
+msgstr "dag"
+
+# calendar/gui/getdate.y:421

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

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

+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "gebeurtenissen"
+
+#: calendar/gui/event-editor.c:839
+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
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
 # calendar/gui/getdate.y:391

 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -3024,17 +3018,17 @@ msgid "Print Calendar"
 msgstr "Druk Kalender af"
 
 # calendar/gui/print.c:1249

-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:934
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 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:345 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "MDWDVZZ"
 
-#: calendar/gui/weekday-picker.c:347 calendar/gui/weekday-picker.c:437
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "ZMDWDVZ"
 
@@ -3208,6 +3202,19 @@ 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
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kon Kerberos ticket niet vergaren:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr "Slechte authenticatie respons van server."
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -3219,7 +3226,7 @@ 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:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
@@ -3242,7 +3249,7 @@ msgstr "De IMAP Server gaf onverwacht een 'OK' respons: %s"
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH respons."
 
@@ -3300,60 +3307,199 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Kon directory %s niet maken: %s"
 
-# mail/mail-threads.c:814

-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "Kon samenvatting niet maken"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "UNIX MH-formaat post directories (CamelLocal versie)"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "Voor het opslaan van lokale post in MH-achtige post directories"
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX mbox-formaat post bestanden (CamelLocal versie)"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr "Voor het opslaan van lokale post in standaard mbox formaat"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr "UNIX qmail maildir-formaat e-mail bestanden (CamelLocal versie)"
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Voor het opslaan van lokale post in qmail maildir directories"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Kan bericht niet aan mbox bestand toevoegen: %s"
+msgid "Store root %s is not an absolute path"
+msgstr "Opslag locatie %s is geen absoluut pad"
 
-# shell/e-shell.c:299

-#: camel/providers/mbox/camel-mbox-folder.c:485
+# composer/e-msg-composer.c:686

+#: camel/providers/local/camel-local-store.c:129
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Kan bericht niet vergaren: %s"
+msgid "Store root %s is not a regular directory"
+msgstr "Opslag stam `%s' is geen gewone directory"
 
-#: camel/providers/local/camel-mbox-provider.c:34
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX mbox-formaat post bestanden"
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Kan map niet vergaren: %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr "Lokale opslag locaties hebben geen stam map"
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr "Lokale opslag locaties hebben geen standaard map"
 
-#: camel/providers/local/camel-mbox-provider.c:36
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr "Lokale mappen mogen niet recursief in elkaar worden opgenomen."
+
+# composer/e-msg-composer.c:474

+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr "Lokaal post bestand %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Kon samenvattings bestand van map `%s' niet verwijderen: %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Kon index bestand van map `%s' niet verwijderen: %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"Voor het lezen van post die is afgeleverd door het lokale systeem en voor "
-"het opslaan van post op de lokale schijf."
+"Kan bericht niet vergaren: %s\n"
+"  %s"
 
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
+msgstr "Ongeldige bericht inhoud"
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Kon bestand `%s' niet openen:\n"
+"Kon map `%s' niet openen:\n"
 "%s"
 
 # composer/e-msg-composer.c:676

 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mbox-store.c:108
 #: camel/providers/local/camel-mh-store.c:103
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Map `%s' bestaat niet."
 
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Kon map `%s' niet maken:\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' is geen maildir directory."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Kon map `%s' niet verwijderen: %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "geen maildir directory"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, 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
+#, 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
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Kan bericht %s uit folder %s niet vergaren\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "De map lijkt onherstelbaar beschadigt te zijn."
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Kon bestand `%s' niet openen:\n"
+"%s"
+
 #: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3365,16 +3511,12 @@ msgstr ""
 # composer/e-msg-composer.c:686

 #: camel/providers/local/camel-mbox-store.c:126
 #: camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' is geen gewoon bestand."
 
 #: camel/providers/local/camel-mbox-store.c:145
 #: camel/providers/local/camel-mbox-store.c:168
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3384,179 +3526,86 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Map `%s' is niet leeg. Niet verwijderd."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
+#: camel/providers/local/camel-mbox-summary.c:234
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Kon de naam van de map niet wijzigen van %s naar %s: de map bestaat al"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Kon map %s niet openen: er zal worden samengevat vanaf positie %ld: %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox mappen mogen niet recursief in elkaar worden opgenomen."
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "Fatale e-mail ontleed fout op positie %ld in map %s"
 
-# composer/e-msg-composer.c:474

-#: camel/providers/local/camel-local-store.c:200
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:341
 #, c-format
-msgid "Local mail file %s"
-msgstr "Lokaal post bestand %s"
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Kon map niet samenvatten: %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
 #, c-format
-msgid "Could not open summary %s"
-msgstr "Kon samenvatting %s niet openen"
+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/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kon tijdelijk postvak niet openen: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
-msgstr "Samenvattingen niet gelijk, synchroniseren word afgebroken"
-
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Samenvattingen niet gelijk, X-Evolution kop ontbreekt"
+#: 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
+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/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fout bij het schrijven naar tijdelijk postvak: %s"
 
-# shell/e-setup.c:84

-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Kan de gegevens niet naar het uitvoerbestand kopiКren: %s"
+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/mbox/camel-mbox-summary.c:832
 #, 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/mbox/camel-mbox-summary.c:841
 #, 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/mbox/camel-mbox-summary.c:849
 #, 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/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Onbekende fout: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "Kon samenvatting niet aanmaken of laden"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
-msgstr "Kan bericht niet toevoegen aan mh map: %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-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Kan bericht niet vergaren: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "UNIX MH-formaat post directories"
-
-#: camel/providers/local/camel-local-provider.c:37
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Voor het opslaan van lokale post in MH-achtige post directories"
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kon map `%s' niet openen:\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kon map `%s' niet maken:\n"
-"%s"
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Kan bericht niet toevoegen aan mh map %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:116
-#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' is geen directory."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Kon map `%s' niet verwijderen: %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Kon de naam van map `%s' niet wijzigen: %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Kon de naam van map `%s' niet wijzigen: %s bestaat al"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH mappen mogen niet recursief in elkaar worden opgenomen."
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Directory voor lokale post %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3575,7 +3624,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:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Bericht %s kon niet worden gevonden."
@@ -3832,7 +3881,7 @@ 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:118
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "bijvoegsel"
 
@@ -3884,7 +3933,7 @@ 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:622
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "Van:"
 
@@ -3899,7 +3948,7 @@ 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:626
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Aan:"
 
@@ -3909,7 +3958,7 @@ 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:628
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
@@ -3933,7 +3982,7 @@ 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:630
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Onderwerp:"
 
@@ -3942,7 +3991,7 @@ msgstr "Onderwerp:"
 msgid "Enter the subject of the mail"
 msgstr "Geef het onderwerp van het bericht"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3952,41 +4001,41 @@ msgstr ""
 "%s"
 
 # composer/e-msg-composer.c:463

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

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

-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error bij openen bestand: %s"
 
-#: composer/e-msg-composer.c:648
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Bezig met opslaan wijzigingen aan bericht..."
 
-#: composer/e-msg-composer.c:650
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Wijzigingen aan bericht opslaan..."
 
-#: composer/e-msg-composer.c:691
+#: composer/e-msg-composer.c:695
 #, 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:735 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:741
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3997,32 +4046,32 @@ msgstr ""
 "Wil je je wijzingen opslaan?"
 
 # composer/e-msg-composer.c:561

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

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

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

-#: composer/e-msg-composer.c:909
+#: composer/e-msg-composer.c:913
 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:919
+#: composer/e-msg-composer.c:923
 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:941
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -4031,17 +4080,17 @@ msgstr ""
 "Weet u zeker dat u het wil invoegen?"
 
 # composer/e-msg-composer.c:748

-#: composer/e-msg-composer.c:962
+#: composer/e-msg-composer.c:966
 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:1339
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Stelt een nieuw bericht op"
 
 # mail/mail-threads.c:814

-#: composer/e-msg-composer.c:1416
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr ""
 "Kon het dialoog venster voor het opstellen van een nieuw bericht niet "
@@ -4053,7 +4102,7 @@ msgid "Cannot initialize Evolution's composer."
 msgstr "Kan de post samensteller van Evolution niet initialiseren."
 
 # composer/e-msg-composer-address-dialog.glade.h:9

-#: filter/e-search-bar.c:175
+#: filter/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "_Zoeken"
 
@@ -4153,8 +4202,8 @@ msgid "<click here to select a date>"
 msgstr "<klik hier om een datum te selecteren>"
 
 # mail/mail-config.c:1490

-#: filter/filter-editor.c:160 mail/mail-autofilter.c:284
-#: mail/mail-autofilter.c:333
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Filter Regel Toevoegen"
 
@@ -4163,6 +4212,18 @@ msgstr "Filter Regel Toevoegen"
 msgid "Edit Filter Rule"
 msgstr "Bewerk VMap Regel"
 
+#: filter/filter-editor.c:433
+#, fuzzy
+msgid "incoming"
+msgstr "Inkomend"
+
+# calendar/gui/calendar-commands.c:56

+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr "Uitgaand"
+
 # filter/filter-editor.c:198

 #: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
@@ -4192,15 +4253,15 @@ msgstr ""
 "Oops, je bent vergeten een map te kiezen.\n"
 "Ga terug en specificeer een geldige map om mail in af te leveren."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Selecteer Map"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Voer een Map URI in"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<klik hier om een map te selecteren>"
 
@@ -4233,34 +4294,34 @@ msgid "Untitled"
 msgstr "Geen Titel"
 
 # addressbook/gui/component/alphabet.glade.h:14

-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Als"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Acties uitvoeren"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "als aan alle criteria wordt voldaan"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 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:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Criteria toevoegen"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Deze criteria Verwijderen"
 
 # calendar/gui/gncal-todo.c:488

-#: mail/folder-browser.c:479 po/tmp/filter.glade.h:8
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
 #: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Bewerken"
@@ -4323,174 +4384,160 @@ msgstr "Verzend datum"
 msgid "Expression"
 msgstr "Expressie"
 
-#: filter/libfilter-i18n.h:9
-msgid "Flagged"
-msgstr "Gevlagd"
-
 # mail/folder-browser-factory.c:37

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

-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Bericht ontvangen"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Bericht verzonden"
 
 # shell/e-shell-view-menu.c:402

-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Verplaats naar Map"
 
-# addressbook/contact-editor/e-contact-editor.c:1294

-#: filter/libfilter-i18n.h:17
-msgid "Read"
-msgstr "Gelezen"
-
 # composer/e-msg-composer-address-dialog.glade.h:7

-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Geaddresseerden"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:17
 msgid "Regex Match"
 msgstr "Overeenkomende Regex"
 
-# mail/folder-browser-factory.c:35

-#: filter/libfilter-i18n.h:20
-msgid "Replied to"
-msgstr "Beantwoord aan"
-
 # composer/e-msg-composer.c:894 composer/e-msg-composer.c:942

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

-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:19
 msgid "Set Status"
 msgstr "Stel Status in"
 
 # mail/mail-config.c:1490

-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Bron"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Specifieke kop"
 
 # addressbook/contact-editor/e-contact-editor-strings.h:35

-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
 msgid "Status"
 msgstr "Status"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
 # mail/message-list.c:495

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

-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "na"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "voor"
 
 # addressbook/contact-editor/e-contact-editor.c:808

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

-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "bevat"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "bevat niet"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "eindigt niet op"
 
 # composer/e-msg-composer.c:676

-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "bestaat niet"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "klinkt niet als"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "begint niet met"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "eindigt op"
 
 # calendar/gui/getdate.y:441

-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "bestaat"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "is grote dan"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "is kleiner dan"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "is niet"
 
 # addressbook/gui/component/alphabet.glade.h:17

-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "is"
 
 # filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:42
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "op of na"
 
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "op of voor"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "klinkt als"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "begint met"
 
 # filter/filter-editor.c:198

-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "was na"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "was voor"
 
@@ -4520,144 +4567,134 @@ msgid "Edit VFolder Rule"
 msgstr "Bewerk VMap Regel"
 
 # mail/component-factory.c:196

-#: mail/component-factory.c:233
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan het post gedeelte van Evolution niet initialiseren."
 
-# mail/component-factory.c:196

-#: mail/component-factory.c:239
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Kan het post samenvattings gedeelte van Evolution niet initialiseren."
-
-# mail/component-factory.c:196

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

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

-#: mail/folder-browser.c:171
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Onderwerp bevat"
 
-#: mail/folder-browser.c:172
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Bericht bevat niet"
 
-#: mail/folder-browser.c:173
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Onderwerp bevat niet"
 
-#: mail/folder-browser.c:467
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr "VMap op Onderwerp"
 
-#: mail/folder-browser.c:468
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr "VMap op Afzender"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr "VMap op Geadresseerden"
 
-#: mail/folder-browser.c:471
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr "Filter op Onderwerp"
 
-#: mail/folder-browser.c:472
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr "Filter op Afzender"
 
-#: mail/folder-browser.c:473
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/folder-browser.c:474 mail/folder-browser.c:558
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr "Filter op Mailing Lijst"
 
-#: mail/folder-browser.c:478 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "Openen"
 
 # composer/e-msg-composer.c:463

-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:466
 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:481 mail/mail-view.c:163
+#: 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
 msgid "Print"
 msgstr "Afdrukken"
 
 # mail/folder-browser-factory.c:35

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

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

-#: mail/folder-browser.c:485 mail/mail-view.c:159
+#: mail/folder-browser.c:471 mail/mail-view.c:159
 #: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Doorsturen"
 
-# composer/e-msg-composer.c:906

-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:18
-msgid "Forward as Attachment"
-msgstr "Bekijk als Bijvoegsel"
+# calendar/gui/calendar-commands.c:554

+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Ga vooruit in tijd"
 
-#: mail/folder-browser.c:488
+#: mail/folder-browser.c:474
 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:489
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Markeer Als Ongelezen"
 
 # shell/e-shell-view-menu.c:402

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

-#: mail/folder-browser.c:492
+#: mail/folder-browser.c:478
 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:494
+#: mail/folder-browser.c:480
 msgid "Undelete"
 msgstr "Terughalen"
 
@@ -4665,15 +4702,15 @@ 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:498
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr "Filters Toepassen"
 
-#: mail/folder-browser.c:500 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Maak Regel Van Bericht"
 
-#: mail/folder-browser.c:560
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter op Mailing Lijst (%s)"
@@ -4696,7 +4733,7 @@ msgstr "Onderwerp is %s"
 msgid "Mail from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-autofilter.c:329
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing lijst"
@@ -4756,16 +4793,16 @@ msgstr ""
 "De geadresseerde moeten worden gespecificeerd om dit bericht te versturen."
 
 # mail/folder-browser-factory.c:41

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

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

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

-#: mail/mail-callbacks.c:849
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4791,14 +4841,50 @@ msgstr ""
 "Fout bij het laden van filter informatie:\n"
 "%s"
 
-#: mail/mail-callbacks.c:894
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Bericht Afdrukken"
 
-#: mail/mail-callbacks.c:941
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Afdrukken van bericht mislukt"
 
+# mail/mail-config.c:1180

+#.
+#. * 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
+msgid "Identity"
+msgstr "Identiteit"
+
+# mail/mail-config.c:1163 mail/mail-config.c:1242

+#: po/tmp/mail-config-druid.glade.h:7
+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:1220

+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Post Transport"
+
+#: 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"
+
+#: po/tmp/mail-config-druid.glade.h:14
+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"
+
 # mail/mail-config.c:262

 #: mail/mail-config-gui.c:433
 msgid ""
@@ -4970,42 +5056,6 @@ msgstr "Bezig met uitzoeken van aanmeldings mogelijkheden van \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "Aanmeldings mogelijkheden van \"%s\" onderzoeken"
 
-# mail/mail-config.c:1180

-#.
-#. * 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
-msgid "Identity"
-msgstr "Identiteit"
-
-# mail/mail-config.c:1163 mail/mail-config.c:1242

-#: po/tmp/mail-config-druid.glade.h:7
-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:1220

-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "Post Transport"
-
-#: 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"
-
-#: po/tmp/mail-config-druid.glade.h:14
-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"
-
 # composer/e-msg-composer-address-dialog.glade.h:11

 #: po/tmp/mail-config.glade.h:7
 msgid "Address"
@@ -5049,53 +5099,25 @@ msgstr "Stuur berichten in HTML formaat"
 msgid "Sources"
 msgstr "Bronnen"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Kon de kanaal naar %s niet maken: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Kon %s niet uitvoeren: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Kan %s niet starten: %s"
-
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Voer je PGP/GPG passphrase in."
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Geen wachtwoord ingevoerd."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, 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:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Geen GPG/PGP programma beschikbaar."
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
-msgstr "Bestand overschrijven?"
-
-# shell/e-storage.c:416

-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Er bestaat al een bestand met die naam.\n"
-"Overschrijven?"
-
-#: mail/mail-display.c:86
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -5105,137 +5127,137 @@ msgstr ""
 "%s"
 
 # mail/mail-threads.c:814

-#: mail/mail-display.c:98
+#: mail/mail-display.c:113
 #, 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:192
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Aanhangsel Opslaan"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:258
 #, 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:274
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Opslaan op Schijf..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "Geef Ingebonden Weer"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Extern Weergave Programma"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:351
 #, 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:329
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Verbergen"
 
 # composer/e-msg-composer-attachment-bar.c:299

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

-#: mail/mail-format.c:624
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Antwoord-Naar:"
 
-#: mail/mail-format.c:846
+#: mail/mail-format.c:845
 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:858
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "Versleutelde berichten worden niet weergegeven"
 
 # composer/e-msg-composer.c:894

-#: mail/mail-format.c:864
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "Versleuteld bericht"
 
-#: mail/mail-format.c:865
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Klik op het icoon om te decoderen."
 
-#: mail/mail-format.c:1467
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wijzer naar FTP site (%s)"
 
-#: mail/mail-format.c:1479
+#: mail/mail-format.c:1482
 #, 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:1483
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wijzer naar lokaal bestand (%s)"
 
-#: mail/mail-format.c:1517
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Wijzer naar onbekende externe gegevens (\"%s\" type)"
 
-#: mail/mail-format.c:1522
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "Misvorms extern-bericht gedeelte"
 
-#: mail/mail-format.c:1692
+#: mail/mail-format.c:1695
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Op %s, %s schreef:\n"
 
-#: mail/mail-local.c:194
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Bezig met veranderen mapformaat van \"%s\" naar \"%s\""
 
-#: mail/mail-local.c:198
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Verander map van \"%s\" naar \"%s\" formaat"
 
-#: mail/mail-local.c:254
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Huidige map gesloten"
 
-#: mail/mail-local.c:286
+#: mail/mail-local.c:293
 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:307
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Bezig met aanmaken van nieuwe map"
 
 # composer/e-msg-composer.c:1127

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

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

-#: mail/mail-local.c:671
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "Registreren lokale map"
 
 # mail/mail-ops.c:374

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

-#: mail/mail-ops.c:80
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-ops.c:330
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Er is geen nieuwe post op %s."
 
-#: mail/mail-ops.c:400
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Bezig met op verzoek filteren van post"
 
-#: mail/mail-ops.c:402
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Filter post op verzoek"
 
-#: mail/mail-ops.c:537
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Bezig met verzenden \"%s\""
 
-#: mail/mail-ops.c:542
+#: 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:545
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "Verstuur \"%s\""
 
-#: mail/mail-ops.c:548
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Stuur een bericht zonder onderwerp"
 
-#: mail/mail-ops.c:719
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "Bezig met verzenden wachtrij"
 
-#: mail/mail-ops.c:721
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Verzendings wachtrij"
 
-#: mail/mail-ops.c:857 mail/mail-ops.c:864
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Bezig met toevoegen \"%s\""
 
-#: mail/mail-ops.c:861 mail/mail-ops.c:867
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "Bezig met toevoegen van een bericht zonder onderwerp"
 
-#: mail/mail-ops.c:939
+#: 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:941
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Legen \"%s\""
 
-#: mail/mail-ops.c:1000
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Bezig met Verplaatsen berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:1002
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Bezig met kopiКren berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:1005
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Verplaats berichten van \"%s\" naar \"%s\""
 
-#: mail/mail-ops.c:1007
+#: mail/mail-ops.c:1008
 #, 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:1038
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Bezig met verplaatsen"
 
 # composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:946

-#: mail/mail-ops.c:1041
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Bezig met kopiКren"
 
-#: mail/mail-ops.c:1061
+#: mail/mail-ops.c:1062
 #, 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:1140
+#: 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:1143
+#: 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:1174
+#: 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:1297
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1299
+#: 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:1368 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Geen beschrijving)"
 
-#: mail/mail-ops.c:1429
+#: 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:1432
+#: 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:1532
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Bezig met Doorsturen berichten \"%s\""
 
-#: mail/mail-ops.c:1536
+#: 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:1539
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Bericht \"%s\" doorsturen"
 
-#: mail/mail-ops.c:1543
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Stuur een bericht door zonder onderwerp"
 
-#: mail/mail-ops.c:1590
+#: 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:1606
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
@@ -5446,111 +5468,117 @@ msgstr ""
 "te sturen bericht."
 
 # mail/folder-browser-factory.c:37

-#: mail/mail-ops.c:1650
+#: mail/mail-ops.c:1665
+#, 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:1719
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Bezig met laden \"%s\""
 
-#: mail/mail-ops.c:1721
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Laden \"%s\""
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Bezig met Maken \"%s\""
 
-#: mail/mail-ops.c:1826
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Maken \"%s\""
 
-#: mail/mail-ops.c:1874
+#: 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:1920
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Bezig met Synchronizeren \"%s\""
 
-#: mail/mail-ops.c:1922
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synchronizeren \"%s\""
 
-#: mail/mail-ops.c:1986
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Bezig met weergeven UID van bericht \"%s\""
 
-#: mail/mail-ops.c:1989
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "Bezig met leegmaken berichtweergave"
 
-#: mail/mail-ops.c:1992
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Geef UID van bericht \"%s\" weer"
 
 # calendar/gui/prop.c:519

-#: mail/mail-ops.c:1995
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "Maak berichtweergave leeg"
 
-#: mail/mail-ops.c:2108
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Bezig met openen berichten uit map \"%s\""
 
-#: mail/mail-ops.c:2111
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Open berichten van \"%s\""
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Bezig met laden %s Map"
 
-#: mail/mail-ops.c:2217
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "Laad \"%s\" Map"
 
-#: mail/mail-ops.c:2281
+#: 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:2284
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Bekijk berichten uit \"%s\""
 
-#: mail/mail-ops.c:2310
+#: 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:2399
+#: mail/mail-ops.c:2428
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Bezig opslaan berichten uit map \"%s\""
 
-#: mail/mail-ops.c:2402
+#: 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:2444
+#: mail/mail-ops.c:2474
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Bezig met opslaan bericht %d van %d (uid \"%s\")"
@@ -5561,7 +5589,7 @@ msgid "Cancel"
 msgstr "Annuleren"
 
 # mail/mail-threads.c:621

-#: mail/mail-summary.c:104 mail/mail-threads.c:728
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "Onafgemaakt bericht naar pipe geschreven!"
 
@@ -5713,43 +5741,43 @@ msgid "Delete this message"
 msgstr "Verwijdert dit bericht"
 
 # calendar/gui/getdate.y:448

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

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

-#: mail/message-list.c:828
+#: mail/message-list.c:846
 #, 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:840 mail/message-list.c:855
+#: mail/message-list.c:858 mail/message-list.c:873
 #, c-format
 msgid "%s, et al."
 msgstr "%s, en dergelijke."
 
 # shell/e-storage.c:434

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

-#: mail/message-list.c:2140
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "Bezig met herstructureren van bericht weergave"
 
 # composer/e-msg-composer.c:894

-#: mail/message-list.c:2142
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Herstructureer bericht weergave"
 
@@ -5948,28 +5976,28 @@ msgid "Go to folder..."
 msgstr "Ga naar folder..."
 
 # shell/e-shell-view.c:113

-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Geen map weergegeven)"
 
 # shell/e-shell-view.c:208

-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Mappen"
 
 # shell/e-shell-view.c:600

-#: shell/e-shell-view.c:1022
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
 # shell/e-shell.c:299

-#: shell/e-shell.c:339
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Kan de lokale opslag niet opzetten -- %s"
 
-#: shell/e-shell.c:1160
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -6059,80 +6087,80 @@ msgstr "Verwijder deze snelkoppeling van de snelkoppelingenbalk"
 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
+msgid "_View"
+msgstr "Weerga_ve"
+
+# mail/folder-browser-factory.c:43

+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Geef de geselecteerde map weer"
+
 # shell/e-storage.c:217

-#: shell/e-storage.c:128
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Geen naam)"
 
 # shell/e-storage.c:412

-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Geen fout"
 
 # shell/e-storage.c:414

-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Generieke fout"
 
 # shell/e-storage.c:416

-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Een folder met die naam bestaat al"
 
 # shell/e-storage.c:418

-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Het gespecificeerde folder type is niet geldig"
 
 # shell/e-storage.c:420

-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "I/O fout"
 
 # shell/e-storage.c:422

-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Niet genoeg ruimte vrij om de folder te maken"
 
 # shell/e-storage.c:424

-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "De opgegeven folder was niet gevonden"
 
 # shell/e-storage.c:426

-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "Functie niet geimplementeerd voor deze opslag"
 
 # shell/e-storage.c:428

-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Operatie niet toegestaan"
 
 # shell/e-storage.c:430

-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Operatie niet ondersteund"
 
 # shell/e-storage.c:432

-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Het gespecificeerde type word niet ondersteund door deze opslag"
 
-# shell/e-shell-view-menu.c:398

-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
-msgid "_View"
-msgstr "Weerga_ve"
-
-# mail/folder-browser-factory.c:43

-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Geef de geselecteerde map weer"
-
 # shell/main.c:99

-#: shell/main.c:70
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -6173,7 +6201,7 @@ msgstr ""
 "wachten met smart je bijdrage af!\n"
 
 # shell/main.c:126

-#: shell/main.c:97
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -6182,16 +6210,16 @@ msgstr ""
 "Het Evolution Team\n"
 
 # shell/main.c:172

-#: shell/main.c:122
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan de Evolution shell niet initialiseren."
 
-#: shell/main.c:144
+#: shell/main.c:178
 msgid "Disable."
 msgstr "Uitzetten."
 
 # shell/main.c:220

-#: shell/main.c:164
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Kan het Bonobo componentensysteem niet initializeren"
 
@@ -6460,7 +6488,7 @@ 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:19
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Opslaan _Als..."
 
@@ -6495,7 +6523,7 @@ 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:40
+#: po/tmp/evolution-message-composer.xml.h:38
 #: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "_Bestand"
@@ -6509,7 +6537,7 @@ 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:44
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Opslaan"
 
@@ -6840,7 +6868,7 @@ 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:11
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "_Opmaak"
 
@@ -6940,7 +6968,7 @@ 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:22
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Huidig bestand opslaan"
 
@@ -6988,13 +7016,13 @@ 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:36
+#: po/tmp/evolution-message-composer.xml.h:34
 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:37
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "_Sluiten"
 
@@ -7004,13 +7032,13 @@ msgid "_Copy"
 msgstr "_KopiКren"
 
 #: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-message-composer.xml.h:36
 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:39
+#: po/tmp/evolution-message-composer.xml.h:37
 #: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "B_ewerken..."
@@ -7028,7 +7056,7 @@ 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:41 po/tmp/evolution.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Help"
 
@@ -7295,7 +7323,8 @@ msgstr "_VMap op Onderwerp"
 
 # mail/folder-browser-factory.c:89

 #: po/tmp/evolution-mail.xml.h:64
-msgid "_Vitrual Folder Editor"
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "_Virtuele Map Bewerker"
 
 # composer/e-msg-composer.c:951

@@ -7307,119 +7336,110 @@ msgstr "_Virtuele Map Bewerker"
 msgid "Attach"
 msgstr "Bijvoegen"
 
-# addressbook/printing/e-contact-print.glade.h:24

-#: po/tmp/evolution-message-composer.xml.h:8
-msgid "Bold"
-msgstr "Vet"
-
 # calendar/gui/calendar-commands.c:553

-#: po/tmp/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Huidig bestand sluiten"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
 # composer/e-msg-composer.c:891

-#: po/tmp/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:12
 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:14
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "Tekst bestand invoegen..."
 
 # composer/e-msg-composer.c:561

-#: po/tmp/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "Bestand openen"
 
 # composer/e-msg-composer.c:463

-#: po/tmp/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Opslaan Als"
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "Opslaan in _map... (FIXME)"
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Opslaan in _map..."
 
 # composer/e-msg-composer.c:888

-#: po/tmp/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:22
 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:24
+#: po/tmp/evolution-message-composer.xml.h:23
 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:25
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Versturen"
 
 # filter/filter-editor.c:198

-#: po/tmp/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "_Later Versturen"
 
 # filter/filter-editor.c:198

-#: po/tmp/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "_Later versturen"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:27
 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:29
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "Dit bericht later versturen"
 
 # composer/e-msg-composer.c:942

-#: po/tmp/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "Dit bericht nu versturen"
 
 # composer/e-msg-composer.c:942

-#: po/tmp/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "Dit bericht nu versturen"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Sets something as bold"
-msgstr "Stelt iets in als vet"
-
 # composer/e-msg-composer.c:907

-#: po/tmp/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "Toon / Verberg bijvoegsels"
 
 # composer/e-msg-composer.c:906

-#: po/tmp/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "Bekijk _bijvoegsels"
 
 # composer/e-msg-composer.c:906

-#: po/tmp/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "Bekijk bijvoegsels"
 
 # composer/e-msg-composer.c:891

-#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "Voeg test-bestand _in... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "_Openen..."
 
@@ -7572,6 +7592,14 @@ msgstr "In_stellingen:"
 msgid "_Task (FIXME)"
 msgstr "_Taak (FIXME)"
 
+# calendar/gui/event-editor.c:1745

+#. 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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B, %Y"
+
 # widgets/meeting-time-sel/e-meeting-time-sel.c:386

 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
@@ -7667,14 +7695,6 @@ msgstr "_Eindtijd vergadering:"
 msgid "All Attendees"
 msgstr "Alle Gasten"
 
-# calendar/gui/event-editor.c:1745

-#. 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:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B, %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -7709,179 +7729,108 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Group %i"
 
-#: camel/providers/imap/camel-imap-auth.c:124
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kon Kerberos ticket niet vergaren:\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:195
-msgid "Bad authentication response from server."
-msgstr "Slechte authenticatie respons van server."
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "UNIX MH-formaat post directories (CamelLocal versie)"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "UNIX mbox-formaat post bestanden (CamelLocal versie)"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "Voor het opslaan van lokale post in standaard mbox formaat"
+# mail/mail-threads.c:814

+#~ msgid "Could not create summary"
+#~ msgstr "Kon samenvatting niet maken"
 
-#: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr "UNIX qmail maildir-formaat e-mail bestanden (CamelLocal versie)"
+#~ msgid "Cannot append message to mbox file: %s"
+#~ msgstr "Kan bericht niet aan mbox bestand toevoegen: %s"
 
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "Voor het opslaan van lokale post in qmail maildir directories"
+# shell/e-shell.c:299

+#~ msgid "Cannot get message: %s"
+#~ msgstr "Kan bericht niet vergaren: %s"
 
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Opslag locatie %s is geen absoluut pad"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "UNIX mbox-formaat post bestanden"
 
-# composer/e-msg-composer.c:686

-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Opslag stam `%s' is geen gewone directory"
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Voor het lezen van post die is afgeleverd door het lokale systeem en voor "
+#~ "het opslaan van post op de lokale schijf."
 
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Kan map niet vergaren: %s: %s"
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr ""
+#~ "Kon de naam van de map niet wijzigen van %s naar %s: de map bestaat al"
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Lokale opslag locaties hebben geen stam map"
+#~ msgid "Mbox folders may not be nested."
+#~ msgstr "Mbox mappen mogen niet recursief in elkaar worden opgenomen."
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Lokale opslag locaties hebben geen standaard map"
+#~ msgid "Could not open summary %s"
+#~ msgstr "Kon samenvatting %s niet openen"
 
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Lokale mappen mogen niet recursief in elkaar worden opgenomen."
+#~ msgid "Summary mismatch, aborting sync"
+#~ msgstr "Samenvattingen niet gelijk, synchroniseren word afgebroken"
 
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Samenvattingen niet gelijk, X-Evolution kop ontbreekt"
 
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Kon samenvattings bestand van map `%s' niet verwijderen: %s"
+# shell/e-setup.c:84

+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Kan de gegevens niet naar het uitvoerbestand kopiКren: %s"
 
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Kon index bestand van map `%s' niet verwijderen: %s"
+#~ msgid "Could not load or create summary"
+#~ msgstr "Kon samenvatting niet aanmaken of laden"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan bericht niet toevoegen aan maildir map: %s: %s"
+#~ msgid "Cannot append message to mh folder: %s"
+#~ msgstr "Kan bericht niet toevoegen aan mh map: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Een dergelijk bericht bestaat niet"
+#~ msgid "UNIX MH-format mail directories"
+#~ msgstr "UNIX MH-formaat post directories"
 
-# addressbook/contact-editor/e-contact-editor.c:782

-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
-msgid "Invalid message contents"
-msgstr "Ongeldige bericht inhoud"
+#~ msgid "Could not rename folder `%s': %s"
+#~ msgstr "Kon de naam van map `%s' niet wijzigen: %s"
 
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' is geen maildir directory."
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Kon de naam van map `%s' niet wijzigen: %s bestaat al"
 
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "geen maildir directory"
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH mappen mogen niet recursief in elkaar worden opgenomen."
 
-#: camel/providers/local/camel-mbox-folder.c:195
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kon postvak niet openen: %s: %s\n"
+#~ msgid "Local mail directory %s"
+#~ msgstr "Directory voor lokale post %s"
 
-#: camel/providers/local/camel-mbox-folder.c:251
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan bericht niet aan mbox bestand toevoegen: %s: %s"
+#~ msgid "Flagged"
+#~ msgstr "Gevlagd"
 
-# 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
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan bericht %s uit folder %s niet vergaren\n"
-"  %s"
+# addressbook/contact-editor/e-contact-editor.c:1294

+#~ msgid "Read"
+#~ msgstr "Gelezen"
 
-#: camel/providers/local/camel-mbox-folder.c:358
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "De map lijkt onherstelbaar beschadigt te zijn."
+# mail/folder-browser-factory.c:35

+#~ msgid "Replied to"
+#~ msgstr "Beantwoord aan"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Opbouwen bericht mislukt: Beschadigde mailbox?"
+# mail/component-factory.c:196

+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr ""
+#~ "Kan het post samenvattings gedeelte van Evolution niet initialiseren."
 
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Kon map %s niet openen: er zal worden samengevat vanaf positie %ld: %s"
+# mail/component-factory.c:196

+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr ""
+#~ "Kan het post \"hash\" opslag gedeelte van Evolution niet initialiseren."
 
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Fatale e-mail ontleed fout op positie %ld in map %s"
+# composer/e-msg-composer.c:906

+#~ msgid "Forward as Attachment"
+#~ msgstr "Bekijk als Bijvoegsel"
 
-#: camel/providers/local/camel-mbox-summary.c:341
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Kon map niet samenvatten: %s: %s"
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Kon de kanaal naar %s niet maken: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Kon map %s niet openen voor genereren van samenvatting: %s"
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Kon %s niet uitvoeren: %s\n"
 
-#: 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
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Samenvatting en map niet gelijk, zelfs na synchronisatie"
+#~ msgid "Cannot fork %s: %s"
+#~ msgstr "Kan %s niet starten: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fout bij het schrijven naar tijdelijk postvak %s: %s"
+# addressbook/printing/e-contact-print.glade.h:24

+#~ msgid "Bold"
+#~ msgstr "Vet"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan bericht niet toevoegen aan mh map %s: %s"
+#~ msgid "Sets something as bold"
+#~ msgstr "Stelt iets in als vet"
 
 # addressbook/gui/component/alphabet.glade.h:7

 #~ msgid "window2"
@@ -8580,10 +8529,6 @@ msgstr "Kan bericht niet toevoegen aan mh map %s: %s"
 #~ msgid "label8"
 #~ msgstr "label8"
 
-# composer/e-msg-composer-attachment-bar.c:395

-#~ msgid "About to save changes to message..."
-#~ msgstr "Bezig met voorbereiden van wijzingen opslaan aan bericht..."
-
 #~ msgid "Load a previously saved message"
 #~ msgstr "Laad een eerder opgeslagen bericht"
 
diff --git a/po/nn.po b/po/nn.po
index 8ceeec85f3..5fe77edc5f 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KDE PIM/abbrowser\n"
-"POT-Creation-Date: 2000-10-08 03:43+0200\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -13,14 +13,246 @@ msgstr ""
 "Content-Type: text/plain; charset=utf8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: addressbook/backend/ebook/e-card.c:3046
+#, fuzzy
+msgid "Card: "
+msgstr "Teikn"
+
+#: addressbook/backend/ebook/e-card.c:3048
+#, fuzzy
+msgid ""
+"\n"
+"Name: "
+msgstr "Navn:"
+
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3053
+#, fuzzy
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr "Etterstaving"
+
+#: addressbook/backend/ebook/e-card.c:3067
+#, fuzzy
+msgid ""
+"\n"
+"Birth Date: "
+msgstr "Start-dato:"
+
+#: addressbook/backend/ebook/e-card.c:3078
+#, fuzzy
+msgid ""
+"\n"
+"Address:"
+msgstr "Adresse"
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3085
+#, fuzzy
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr "ZIP/Postnummer"
+
+#: addressbook/backend/ebook/e-card.c:3086
+#, fuzzy
+msgid ""
+"\n"
+"  Country:     "
+msgstr "Land:"
+
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3138
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr "E-post 2"
+
+#: addressbook/backend/ebook/e-card.c:3141
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:"
+msgstr "E-post 2"
+
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3178
+#, fuzzy
+msgid ""
+"\n"
+"Business Role: "
+msgstr "Firma"
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3191
+#, fuzzy
+msgid ""
+"\n"
+"  Name:  "
+msgstr "Navn:"
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3199
+#, fuzzy
+msgid ""
+"\n"
+"Categories: "
+msgstr "Kategoriar"
+
+#: addressbook/backend/ebook/e-card.c:3200
+#, fuzzy
+msgid ""
+"\n"
+"Comment: "
+msgstr "Kommentar:"
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3216
+#, fuzzy
+msgid ""
+"\n"
+"Public Key: "
+msgstr "Praksis"
+
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: 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:1215
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1673
-#: calendar/conduits/todo/todo-conduit.c:1173 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikkje initiere Bonobo"
 
@@ -28,86 +260,101 @@ msgstr "Kunne ikkje initiere Bonobo"
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
 #.
-#: addressbook/conduit/address-conduit-control-applet.c:54
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:55
-#: calendar/conduits/todo/todo-conduit-control-applet.c:70
+#: addressbook/conduit/address-conduit-control-applet.c:77
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
+#: calendar/conduits/todo/todo-conduit-control-applet.c:77
 msgid "Disabled"
 msgstr "Deaktivert"
 
-#: addressbook/conduit/address-conduit-control-applet.c:55
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:56
-#: calendar/conduits/todo/todo-conduit-control-applet.c:71
+#: addressbook/conduit/address-conduit-control-applet.c:78
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
+#: calendar/conduits/todo/todo-conduit-control-applet.c:78
 msgid "Synchronize"
 msgstr "SynkronisИr"
 
-#: addressbook/conduit/address-conduit-control-applet.c:56
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:57
-#: calendar/conduits/todo/todo-conduit-control-applet.c:72
+#: addressbook/conduit/address-conduit-control-applet.c:79
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
+#: calendar/conduits/todo/todo-conduit-control-applet.c:79
 msgid "Copy From Pilot"
 msgstr "KopiИr fra pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:57
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:58
-#: calendar/conduits/todo/todo-conduit-control-applet.c:73
+#: addressbook/conduit/address-conduit-control-applet.c:80
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
+#: calendar/conduits/todo/todo-conduit-control-applet.c:80
 msgid "Copy To Pilot"
 msgstr "KopiИr til pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:58
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:59
-#: calendar/conduits/todo/todo-conduit-control-applet.c:74
+#: addressbook/conduit/address-conduit-control-applet.c:81
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
+#: calendar/conduits/todo/todo-conduit-control-applet.c:81
 msgid "Merge From Pilot"
 msgstr "Flett fra pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:59
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:60
-#: calendar/conduits/todo/todo-conduit-control-applet.c:75
+#: addressbook/conduit/address-conduit-control-applet.c:82
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
+#: calendar/conduits/todo/todo-conduit-control-applet.c:82
 msgid "Merge To Pilot"
 msgstr "Flett til pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:143
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:144
-#: calendar/conduits/todo/todo-conduit-control-applet.c:116
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr ""
+
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+#, fuzzy
+msgid "Original Author:"
+msgstr "Opprinneleg forfattar"
+
+#: addressbook/conduit/address-conduit-control-applet.c:123
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#: addressbook/conduit/address-conduit-control-applet.c:145
-msgid "Gpilotd address conduit"
+#: addressbook/conduit/address-conduit-control-applet.c:127
+#, fuzzy
+msgid "Evolution Addressbook Conduit"
 msgstr "Gpilotd adressekomponent"
 
-#: addressbook/conduit/address-conduit-control-applet.c:146
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:147
-msgid "(C) 1998 the Free Software Foundation"
-msgstr "(C) 1998 the Free Software Foundation"
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:148
+#: addressbook/conduit/address-conduit-control-applet.c:130
 #, fuzzy
-msgid "Configuration utility for the address conduit.\n"
+msgid "Configuration utility for the evolution addressbook conduit.\n"
 msgstr "Oppsettfil lasta pц╔ nytt."
 
-#: addressbook/conduit/address-conduit-control-applet.c:149
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:150
-#: calendar/conduits/todo/todo-conduit-control-applet.c:124
+#: addressbook/conduit/address-conduit-control-applet.c:131
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
 msgid "gnome-unknown.xpm"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:190
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:191
-#: calendar/conduits/todo/todo-conduit-control-applet.c:155
+#: addressbook/conduit/address-conduit-control-applet.c:162
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
+#: calendar/conduits/todo/todo-conduit-control-applet.c:162
 #, fuzzy
 msgid "Synchronize Action"
 msgstr "Synkroniser"
 
-#: addressbook/conduit/address-conduit-control-applet.c:261
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:262
+#: addressbook/conduit/address-conduit-control-applet.c:214
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
 #: calendar/conduits/todo/todo-conduit-control-applet.c:214
 #, fuzzy
 msgid "Conduit state"
 msgstr "&Lenkjer"
 
-#: addressbook/conduit/address-conduit-control-applet.c:315
-#: addressbook/conduit/address-conduit-control-applet.c:328
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:316
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:329
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
 #: calendar/conduits/todo/todo-conduit-control-applet.c:266
 #: calendar/conduits/todo/todo-conduit-control-applet.c:279
 msgid ""
@@ -115,15 +362,15 @@ msgid ""
 "'Pilot Link Properties' capplet first."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:334
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:335
+#: addressbook/conduit/address-conduit-control-applet.c:285
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
 #: calendar/conduits/todo/todo-conduit-control-applet.c:285
 #, fuzzy
 msgid "Not connected to the gnome-pilot daemon"
 msgstr "Kan ikkje kopla til daemon"
 
-#: addressbook/conduit/address-conduit-control-applet.c:339
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:340
+#: addressbook/conduit/address-conduit-control-applet.c:290
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
 #: calendar/conduits/todo/todo-conduit-control-applet.c:290
 #, fuzzy
 msgid ""
@@ -131,34 +378,33 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr "Feil under opning av dette dokumentet"
 
-#: addressbook/conduit/address-conduit.c:127
-#: addressbook/conduit/address-conduit.c:141
-msgid "BLARG\n"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:471
-#, c-format
-msgid "Address holds %ld address entries"
+#: addressbook/conduit/address-conduit.c:210
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:497
-#: addressbook/conduit/address-conduit.c:499
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 #, fuzzy
-msgid "Could not start addressbook server"
-msgstr ""
-"Kunne ikkje starta prosess\n"
-"%1"
+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
+#, fuzzy
+msgid "Could not start wombat"
+msgstr "Kunne ikkje starta %1."
 
-#: addressbook/conduit/address-conduit.c:512
-#: addressbook/conduit/address-conduit.c:515
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:853
-#, fuzzy
-msgid "Error while communicating with address server"
-msgstr "Feil ved tilkopling til tenar."
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -178,123 +424,11 @@ msgstr ""
 msgid "Available Categories:"
 msgstr "Tilgjengelege kategoriar"
 
-#: addressbook/contact-editor/e-contact-editor.c:1216
-#, fuzzy
-msgid "Assistant"
-msgstr "Namn pц╔ assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1217
-#: addressbook/contact-editor/e-contact-editor.c:1321
-msgid "Business"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1218
-#, fuzzy
-msgid "Business 2"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-msgid "Business Fax"
-msgstr "Firma-fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Callback"
-msgstr "Ring tilbake"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-#, fuzzy
-msgid "Car"
-msgstr "Teikn"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-#: addressbook/contact-editor/e-contact-editor.c:1322
-msgid "Home"
-msgstr "Heim"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-#, fuzzy
-msgid "Home 2"
-msgstr "Heim"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-msgid "Home Fax"
-msgstr "Heime-faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-#, fuzzy
-msgid "Mobile"
-msgstr "Mobil:"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-#: addressbook/contact-editor/e-contact-editor.c:1323
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "Anna"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Other Fax"
-msgstr "Alternativ faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-msgid "Pager"
-msgstr "Personsц╦kjar"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-#, fuzzy
-msgid "Primary"
-msgstr "Privat"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-#, fuzzy
-msgid "Radio"
-msgstr "Tilfeldig"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-#, fuzzy
-msgid "TTY/TDD"
-msgstr "TTY/TDD-telefon"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1278
-#, fuzzy
-msgid "Primary Email"
-msgstr "Primц╕r&oppsett"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#, fuzzy
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-#, fuzzy
-msgid "Email 3"
-msgstr "E-post 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Er du sikker pц╔ at du vil sletta denne klassen?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 #, fuzzy
 msgid "Delete Contact?"
 msgstr "Slett kolonne"
@@ -310,7 +444,7 @@ msgid "_Add"
 msgstr "Legg til"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: calendar/gui/dialogs/task-editor.c:459 calendar/gui/event-editor.c:1203
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 #, fuzzy
 msgid "_Delete"
 msgstr "Slett"
@@ -326,9 +460,13 @@ msgstr "Kjende typar"
 msgid "New phone type"
 msgstr "&Ny type"
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:90 mail/mail-config.glade.h:11
-#: mail/mail-config.glade.h:16 mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Legg til"
 
@@ -376,6 +514,12 @@ msgstr "Firma-fax"
 msgid "_Mobile"
 msgstr "Mobil:"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+#, fuzzy
+msgid "Primary Email"
+msgstr "Primц╕r&oppsett"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 #, fuzzy
 msgid "B_usiness"
@@ -392,7 +536,7 @@ msgid "C_ontacts..."
 msgstr "&Innhald ..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 #, fuzzy
 msgid "Ca_tegories..."
 msgstr "Kategoriar ..."
@@ -413,7 +557,7 @@ msgid "_Address..."
 msgstr "Adresse"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Generelt"
 
@@ -468,59 +612,163 @@ msgid "No_tes:"
 msgstr "Notat:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Detaljar"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+#, fuzzy
+msgid "Assistant"
+msgstr "Namn pц╔ assistent"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Firma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+#, fuzzy
+msgid "Business 2"
+msgstr "Firma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Firma-fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Ring tilbake"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+#, fuzzy
+msgid "Car"
+msgstr "Teikn"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Heim"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+#, fuzzy
+msgid "Home 2"
+msgstr "Heim"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Heime-faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+#, 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
+msgid "Other"
+msgstr "Anna"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Alternativ faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Personsц╦kjar"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+#, fuzzy
+msgid "Primary"
+msgstr "Privat"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+#, fuzzy
+msgid "Radio"
+msgstr "Tilfeldig"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+#, fuzzy
+msgid "TTY/TDD"
+msgstr "TTY/TDD-telefon"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+#, fuzzy
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+#, fuzzy
+msgid "Email 3"
+msgstr "E-post 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
+#, fuzzy
+msgid "Address _2:"
+msgstr "Adresse"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:8
 #, fuzzy
 msgid "Check Address"
 msgstr "Alternativ adresse"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
 #, fuzzy
-msgid "_Street Address:"
-msgstr "Gateadresse"
+msgid "Countr_y:"
+msgstr "Land:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
-msgid "City:"
-msgstr "Stad:"
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
-#, fuzzy
-msgid "State/Province:"
-msgstr "Stat/provins"
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Country:"
-msgstr "Land:"
+#: po/tmp/fulladdr.glade.h:12
+#, fuzzy
+msgid "_Address:"
+msgstr "Adresse"
 
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:13
 #, fuzzy
-msgid "ZIP/Postal Code:"
-msgstr "ZIP/Postnummer"
+msgid "_City:"
+msgstr "Stad:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
+#: po/tmp/fulladdr.glade.h:14
 #, fuzzy
-msgid "E_xt:"
-msgstr "Avslutt"
+msgid "_PO Box:"
+msgstr "Postboks"
 
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid ""
-"USA\n"
-"Canada\n"
-"Finland\n"
-msgstr ""
+#: po/tmp/fulladdr.glade.h:15
+#, fuzzy
+msgid "_State/Province:"
+msgstr "Stat/provins"
 
-#: addressbook/contact-editor/fulladdr.glade.h:18
+#: po/tmp/fulladdr.glade.h:16
 #, fuzzy
-msgid "PO Box:"
-msgstr "Postboks"
+msgid "_ZIP Code:"
+msgstr "ZIP/Postnummer"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -576,12 +824,27 @@ msgstr "Etternamn"
 msgid "_Suffix:"
 msgstr "Etterstaving"
 
-#: addressbook/gui/component/addressbook.c:408
+#: addressbook/gui/component/addressbook.c:263
+#, fuzzy
+msgid "As _Minicards"
+msgstr "Bruk jokerteikn"
+
+#.
+#. * 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
+#, fuzzy
+msgid "As _Table"
+msgstr "Tabell"
+
+#: addressbook/gui/component/addressbook.c:386
 #, fuzzy
 msgid "Unable to open addressbook"
 msgstr "Kan ikkje opna adresseboka."
 
-#: addressbook/gui/component/addressbook.c:413
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -590,20 +853,32 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:530
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+msgid "Show All"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 #, fuzzy
-msgid "As _Minicards"
-msgstr "Bruk jokerteikn"
+msgid "Advanced..."
+msgstr "Legg til ..."
+
+#: addressbook/gui/component/addressbook.c:533
+msgid "Any field contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:534
+msgid "Name contains"
+msgstr ""
 
 #: addressbook/gui/component/addressbook.c:535
 #, fuzzy
-msgid "As _Table"
-msgstr "Tabell"
+msgid "Email contains"
+msgstr "Smц╔ ikon"
 
-#: addressbook/gui/component/addressbook.c:575
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr ""
 
@@ -613,204 +888,194 @@ msgid "External Directories"
 msgstr "Separate katalogar"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Skildring:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 #, fuzzy
 msgid "LDAP Server:"
 msgstr "Tenar:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "Navn:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Portnummer:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:10
 #, fuzzy
 msgid "Root DN:"
 msgstr "Rot"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "Navn:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
+#: po/tmp/select-names.glade.h:6
+msgid "Find..."
+msgstr "Finn ..."
+
+#: po/tmp/select-names.glade.h:7
+#, fuzzy
+msgid "Message Recipients"
+msgstr "Melding motteken"
+
+#: po/tmp/select-names.glade.h:8
 #, fuzzy
 msgid "Select Names"
 msgstr "Merk omrц╔de"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:8
-msgid "Find..."
-msgstr "Finn ..."
-
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:9
 #, fuzzy
 msgid "Select name from List:"
 msgstr "Vel ei gruppe fц╦rst."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-#, fuzzy
-msgid "Message Recipients"
-msgstr "Melding motteken"
+#: 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 Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-#, fuzzy
-msgid "window2"
-msgstr "Vindauge"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 #, fuzzy
 msgid "a"
 msgstr "am"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 #, fuzzy
 msgid "b"
 msgstr "av"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 #, fuzzy
 msgid "c"
 msgstr "cm"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 #, fuzzy
 msgid "d"
 msgstr "Id"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 #, fuzzy
 msgid "g"
 msgstr "gs"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 #, fuzzy
 msgid "i"
 msgstr "er"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 #, fuzzy
 msgid "k"
 msgstr "Ok"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 #, fuzzy
 msgid "m"
 msgstr "ms"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 #, fuzzy
 msgid "n"
 msgstr "Pц╔"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 #, fuzzy
 msgid "o"
 msgstr "Nei"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 #, fuzzy
 msgid "p"
 msgstr "pm"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 #, fuzzy
 msgid "r"
 msgstr "Dr"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 #, fuzzy
 msgid "t"
 msgstr "Qt"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 #, fuzzy
 msgid "x"
 msgstr "Tx"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 #, fuzzy
 msgid "y"
 msgstr "av"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 #, fuzzy
 msgid "z"
 msgstr "Hz"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:417
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-minicard.c:338
 #, fuzzy
 msgid "Save as VCard"
 msgstr "Lagra som"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:543
-#, fuzzy
-msgid "* Click here to add a contact *"
-msgstr "Trykk her for ц╔ leggja til ein ny virtuell vert."
-
 #: addressbook/gui/widgets/e-minicard-control.c:278
 #, fuzzy
 msgid "Save in addressbook"
@@ -825,425 +1090,333 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#. gtk_signal_connect(fb->search_entry, "changed", search_activate, fb);
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:405
-msgid "Search"
-msgstr "Sц╦k"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-#, fuzzy
-msgid "Page Setup:"
-msgstr "Speloppsett"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:8
-#, fuzzy
-msgid "Style name:"
-msgstr "Typenamn:"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "Fц╦rehandsvising:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Val"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Kropp"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-#, fuzzy
-msgid "Include:"
-msgstr "Inkluder fil"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Botn:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
+#: po/tmp/e-contact-print.glade.h:11
 #, fuzzy
-msgid "Sections:"
-msgstr "Del:"
+msgid "Dimensions:"
+msgstr "Dimensjonar"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Skrifttype ..."
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "Skrifttypar"
 
-#: addressbook/printing/e-contact-print.glade.h:15
+#: po/tmp/e-contact-print.glade.h:14
 #, fuzzy
-msgid "Headings for each letter"
-msgstr "Les mapper"
+msgid "Footer:"
+msgstr "Botntekst"
+
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Format"
 
-#: addressbook/printing/e-contact-print.glade.h:16
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "Dekl."
+
+#: po/tmp/e-contact-print.glade.h:17
 #, fuzzy
-msgid "Start on a new page"
-msgstr "Startar nytt spel ..."
+msgid "Header/Footer"
+msgstr "&Topp-/botntekst ..."
 
-#: addressbook/printing/e-contact-print.glade.h:17
+#: po/tmp/e-contact-print.glade.h:18
 #, fuzzy
-msgid "Number of columns:"
-msgstr "Tal pц╔ kolonnar:"
+msgid "Headings"
+msgstr "Les"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:19
+#, fuzzy
+msgid "Headings for each letter"
+msgstr "Les mapper"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "Skrifttypar"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "Hц╦gd:"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Skrifttype ..."
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:22
 #, fuzzy
-msgid "Headings"
-msgstr "Les"
+msgid "Include:"
+msgstr "Inkluder fil"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Liggjande"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Kropp"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Venstre:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:26
+#: po/tmp/e-contact-print.glade.h:26
 #, fuzzy
-msgid "Shading"
-msgstr "Lagring"
+msgid "Margins"
+msgstr "&Marg"
 
-#: addressbook/printing/e-contact-print.glade.h:27
+#: po/tmp/e-contact-print.glade.h:27
 #, fuzzy
-msgid "Print using gray shading"
-msgstr "Skriv med grц╔nyansar"
-
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Format"
+msgid "Number of columns:"
+msgstr "Tal pц╔ kolonnar:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Papir"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Val"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Type:"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Retning"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:80
-#, fuzzy
-msgid "label26"
-msgstr "Etikett"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Side"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
+#: po/tmp/e-contact-print.glade.h:31
 #, fuzzy
-msgid "Dimensions:"
-msgstr "Dimensjonar"
-
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Breidd:"
+msgid "Page Setup:"
+msgstr "Speloppsett"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "Hц╦gd:"
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Papir"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:33
 #, fuzzy
 msgid "Paper source:"
 msgstr "Papir&storleik:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-#, fuzzy
-msgid "Margins"
-msgstr "&Marg"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "Stц╔ande"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "Topp:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "Fц╦rehandsvising:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Botn:"
+#: po/tmp/e-contact-print.glade.h:36
+#, fuzzy
+msgid "Print using gray shading"
+msgstr "Skriv med grц╔nyansar"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Venstre:"
+#: po/tmp/e-contact-print.glade.h:37
+#, fuzzy
+msgid "Reverse on even pages"
+msgstr "Merk partal-sider"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Hц╦gre:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Side"
+#: po/tmp/e-contact-print.glade.h:39
+#, fuzzy
+msgid "Sections:"
+msgstr "Del:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:40
+#, fuzzy
+msgid "Shading"
+msgstr "Lagring"
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Storleik:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Retning"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Stц╔ande"
+#: po/tmp/e-contact-print.glade.h:42
+#, fuzzy
+msgid "Start on a new page"
+msgstr "Startar nytt spel ..."
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Liggjande"
+#: po/tmp/e-contact-print.glade.h:43
+#, fuzzy
+msgid "Style name:"
+msgstr "Typenamn:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "Dekl."
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Topp:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-#, fuzzy
-msgid "Footer:"
-msgstr "Botntekst"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Type:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-#, fuzzy
-msgid "Reverse on even pages"
-msgstr "Merk partal-sider"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Breidd:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
+#: po/tmp/e-contact-print.glade.h:47
 #, fuzzy
-msgid "Header/Footer"
-msgstr "&Topp-/botntekst ..."
+msgid "label26"
+msgstr "Etikett"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c: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:146
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 #, fuzzy
-msgid "Gpilotd calendar conduit"
+msgid "Evolution Calendar Conduit"
 msgstr "Tilgjengelege lenkjer:"
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:149
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
 #, fuzzy
-msgid "Configuration utility for the calendar conduit.\n"
+msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr "ц≤ydelagd oppsettfil."
 
-#: calendar/conduits/calendar/calendar-conduit.c:398
-#: calendar/conduits/calendar/calendar-conduit.c:1111
-#: calendar/conduits/todo/todo-conduit.c:554
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 #, fuzzy
 msgid "Error while communicating with calendar server"
 msgstr "Feil ved tilkopling til tenar."
 
-#: calendar/conduits/calendar/calendar-conduit.c:778
-#: calendar/conduits/calendar/calendar-conduit.c:780
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 #, fuzzy
-msgid "Could not start gnomecal server"
-msgstr ""
-"Kunne ikkje starta prosess\n"
-"%1"
-
-#: calendar/conduits/calendar/calendar-conduit.c:808
-#: calendar/conduits/calendar/calendar-conduit.c:811
-msgid "Could not read pilot's DateBook application block"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:114
-msgid "JP Rosevear <jpr@helixcode.com>"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:115
-#, fuzzy
-msgid "Original Author:"
-msgstr "Opprinneleg forfattar"
+msgid "Could not read pilot's Calendar application block"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:120
+#: calendar/conduits/todo/todo-conduit-control-applet.c:127
 msgid "Evolution ToDo Conduit"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:121
-msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
-msgstr ""
-
-#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:130
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:599
-#, fuzzy
-msgid "Could not start wombat server"
-msgstr "Kunne ikkje starta underprosess."
-
-#: calendar/conduits/todo/todo-conduit.c:600
-#, fuzzy
-msgid "Could not start wombat"
-msgstr "Kunne ikkje starta %1."
-
-#: calendar/conduits/todo/todo-conduit.c:658
-#: calendar/conduits/todo/todo-conduit.c:661
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:60
 #, fuzzy
 msgid "Outline:"
 msgstr "Oversikt"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:61
 #, fuzzy
 msgid "Headings:"
 msgstr "Overskrift:"
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:62
 #, fuzzy
 msgid "Empty days:"
 msgstr " dag"
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:63
 #, fuzzy
 msgid "Appointments:"
 msgstr "Avtale"
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:64
 #, fuzzy
 msgid "Highlighted day:"
 msgstr "Opplysing:"
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:65
 #, fuzzy
 msgid "Day numbers:"
 msgstr "Hц╦gste tal"
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:66
 #, fuzzy
 msgid "Current day's number:"
 msgstr "Noverande namn:"
 
-#: calendar/gui/calendar-commands.c:66
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:67
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is due today:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:68
+#: calendar/gui/calendar-commands.c:69
 #, fuzzy
 msgid "To-Do item that is overdue:"
 msgstr "Element i hugselista:"
 
-#: calendar/gui/calendar-commands.c:370
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Fann ikkje fil"
 
-#: calendar/gui/calendar-commands.c:394
+#: calendar/gui/calendar-commands.c:378
 #, fuzzy
 msgid "Open calendar"
 msgstr "Feil ved opning"
 
-#: calendar/gui/calendar-commands.c:433
+#: calendar/gui/calendar-commands.c:417
 #, fuzzy
 msgid "Save calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-commands.c:464
-msgid "Day"
-msgstr "Dag"
-
-#: calendar/gui/calendar-commands.c:464
-#, fuzzy
-msgid "Show 1 day"
-msgstr "Vis dato"
-
-#: calendar/gui/calendar-commands.c:467
-#, fuzzy
-msgid "5 Days"
-msgstr " dag"
-
-#: calendar/gui/calendar-commands.c:467
-#, fuzzy
-msgid "Show the working week"
-msgstr "Vis hovudvindauget"
-
-#: calendar/gui/calendar-commands.c:470
-msgid "Week"
-msgstr "Veke"
-
-#: calendar/gui/calendar-commands.c:470
-#, fuzzy
-msgid "Show 1 week"
-msgstr "Vis %1"
-
-#: calendar/gui/calendar-commands.c:473
-msgid "Month"
-msgstr "Mц╔nad"
-
-#: calendar/gui/calendar-commands.c:473
-#, fuzzy
-msgid "Show 1 month"
-msgstr "Vis metodar"
-
-#: calendar/gui/calendar-commands.c:477
-#, fuzzy
-msgid "Year"
-msgstr "ц┘r"
-
-#: calendar/gui/calendar-commands.c:477
-#, fuzzy
-msgid "Show 1 year"
-msgstr "Vis topptekst"
-
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:740
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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:743
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 #, fuzzy
 msgid "Public"
 msgstr "Praksis"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privat"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 #, fuzzy
 msgid "Confidential"
 msgstr "Eksponentiell"
@@ -1280,7 +1453,7 @@ msgstr "Gjennomsiktig "
 msgid "Opaque"
 msgstr "Opna"
 
-#: calendar/gui/calendar-model.c:748
+#: calendar/gui/calendar-model.c:744
 #, fuzzy, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1289,52 +1462,52 @@ msgid ""
 msgstr "Ein bandindeks mц╔ vera valt i treet."
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:849 calendar/gui/calendar-model.c:897
-#: widgets/misc/e-dateedit.c:475 widgets/misc/e-dateedit.c:507
-#: widgets/misc/e-dateedit.c:664 widgets/misc/e-dateedit.c:720
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 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:867
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr ""
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:870
+#: calendar/gui/calendar-model.c:866
 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:874
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr ""
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:877
+#: calendar/gui/calendar-model.c:873
 #, fuzzy
 msgid "%H:%M%n"
 msgstr "%H:%M"
 
-#: calendar/gui/calendar-model.c:997
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1037
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1077
+#: calendar/gui/calendar-model.c:1073
 #, fuzzy
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteten mц╔ vera i omrц╔det 1-99"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 #, fuzzy
 msgid "The URI that the calendar will display"
 msgstr "Viser korleis datoverdiar vert viste."
@@ -1353,985 +1526,762 @@ msgid "No summary available."
 msgstr "Ingen bilete tilgjengeleg."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: calendar/gui/event-editor.c:1372
+#: 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
 msgid "Close"
 msgstr "Lukk"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1427
-#, fuzzy
-msgid "Snooze"
-msgstr "Spooler"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 #, fuzzy
 msgid "Edit appointment"
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: 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
 #, fuzzy
 msgid "Snooze time (minutes)"
 msgstr "Lц╔g grense (minutt):"
 
-#: calendar/gui/dialogs/task-editor.c:427
-#: calendar/gui/dialogs/task-editor.c:434 calendar/gui/event-editor.c:1178
-msgid "FIXME: _Task"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:428
-#: calendar/gui/dialogs/task-editor.c:435 calendar/gui/event-editor.c:1179
-msgid "FIXME: Task _Request"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:430 calendar/gui/event-editor.c:1176
-msgid "FIXME: _Mail Message"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:431
+#.
+#. * 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
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "Avtale"
-
-#: calendar/gui/dialogs/task-editor.c:432
-msgid "FIXME: Meeting Re_quest"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:433 calendar/gui/event-editor.c:1177
-msgid "FIXME: _Contact"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:436 calendar/gui/event-editor.c:1180
-msgid "FIXME: _Journal Entry"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:437 calendar/gui/event-editor.c:1181
-msgid "FIXME: _Note"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:439
-#: calendar/gui/dialogs/task-editor.c:547 calendar/gui/event-editor.c:1183
-#: calendar/gui/event-editor.c:1291
-msgid "FIXME: Ch_oose Form..."
-msgstr ""
+msgid "05 minutes"
+msgstr "minutt"
 
-#: calendar/gui/dialogs/task-editor.c:444 calendar/gui/event-editor.c:1188
+#: po/tmp/cal-prefs-dialog.glade.h:7
 #, fuzzy
-msgid "FIXME: _Memo Style"
-msgstr "Elementstil"
-
-#: calendar/gui/dialogs/task-editor.c:446 calendar/gui/event-editor.c:1190
-msgid "FIXME: Define Print _Styles..."
-msgstr ""
+msgid "10 minutes"
+msgstr "minutt"
 
-#: calendar/gui/dialogs/task-editor.c:453 calendar/gui/event-editor.c:1197
-msgid "FIXME: S_end"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:457 calendar/gui/event-editor.c:1201
+#: po/tmp/cal-prefs-dialog.glade.h:9
 #, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Smarte vedlegg"
+msgid "15 minutes"
+msgstr "minutt"
 
-#: calendar/gui/dialogs/task-editor.c:461 calendar/gui/event-editor.c:1205
+#: po/tmp/cal-prefs-dialog.glade.h:10
 #, fuzzy
-msgid "FIXME: _Move to Folder..."
-msgstr "Flytt til mappe"
+msgid "24 hour"
+msgstr "time/timar"
 
-#: calendar/gui/dialogs/task-editor.c:462 calendar/gui/event-editor.c:1206
+#: po/tmp/cal-prefs-dialog.glade.h:11
 #, fuzzy
-msgid "FIXME: Cop_y to Folder..."
-msgstr "Kopier til mappe"
+msgid "30 minutes"
+msgstr "minutt"
 
-#: calendar/gui/dialogs/task-editor.c:464 calendar/gui/event-editor.c:1208
+#: po/tmp/cal-prefs-dialog.glade.h:12
 #, fuzzy
-msgid "Page Set_up"
-msgstr "Speloppsett"
+msgid "60 minutes"
+msgstr "minutt"
 
-#: calendar/gui/dialogs/task-editor.c:465 calendar/gui/event-editor.c:1209
-#, fuzzy
-msgid "FIXME: Print Pre_view"
-msgstr "&Fц╦rehandsvising ..."
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:486 calendar/gui/event-editor.c:1230
+#: po/tmp/cal-prefs-dialog.glade.h:14
 #, fuzzy
-msgid "FIXME: Paste _Special..."
-msgstr "Lim inn spesiell ..."
+msgid "Audio Alarms"
+msgstr "Alarm"
 
-#: calendar/gui/dialogs/task-editor.c:491 calendar/gui/event-editor.c:1235
-#, fuzzy
-msgid "FIXME: Mark as U_nread"
-msgstr "Mar&ker som ulesen"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:495 calendar/gui/event-editor.c:1239
+#: po/tmp/cal-prefs-dialog.glade.h:16
 #, fuzzy
-msgid "_Object"
-msgstr "Objekt"
-
-#: calendar/gui/dialogs/task-editor.c:500
-#: calendar/gui/dialogs/task-editor.c:508 calendar/gui/event-editor.c:1244
-#: calendar/gui/event-editor.c:1251
-msgid "FIXME: _Item"
-msgstr ""
+msgid "Calendar"
+msgstr "Skriv ut alle"
 
-#: calendar/gui/dialogs/task-editor.c:501
-#: calendar/gui/dialogs/task-editor.c:509 calendar/gui/event-editor.c:1245
-#: calendar/gui/event-editor.c:1252
-msgid "FIXME: _Unread Item"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:17
+#, fuzzy
+msgid "Calendar Preferences"
+msgstr "Innstillingar"
 
-#: calendar/gui/dialogs/task-editor.c:502
-#: calendar/gui/dialogs/task-editor.c:510
-msgid "FIXME: In_complete Task"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Fargar"
 
-#: calendar/gui/dialogs/task-editor.c:503 calendar/gui/event-editor.c:1246
-msgid "FIXME: Fi_rst Item in Folder"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:511 calendar/gui/event-editor.c:1253
-msgid "FIXME: _Last Item in Folder"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:516 calendar/gui/event-editor.c:1258
-#, fuzzy
-msgid "FIXME: _Standard"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
 msgstr "Standard"
 
-#: calendar/gui/dialogs/task-editor.c:518
-msgid "FIXME: __Formatting"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:521 calendar/gui/event-editor.c:1263
+#: po/tmp/cal-prefs-dialog.glade.h:22
 #, fuzzy
-msgid "FIXME: _Customize..."
-msgstr "Tilpass ..."
-
-#: calendar/gui/dialogs/task-editor.c:526 calendar/gui/event-editor.c:1268
-#, fuzzy
-msgid "Pre_vious"
-msgstr "Fц╦rre"
+msgid "Display options"
+msgstr "Vis"
 
-#: calendar/gui/dialogs/task-editor.c:527 calendar/gui/event-editor.c:1269
-#, fuzzy
-msgid "Ne_xt"
-msgstr "Neste"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "Forfallsdato"
 
-#: calendar/gui/dialogs/task-editor.c:529 calendar/gui/event-editor.c:1273
-#, fuzzy
-msgid "_Toolbars"
-msgstr "Verktц╦ylinjer"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:534 calendar/gui/event-editor.c:1278
+#: po/tmp/cal-prefs-dialog.glade.h:25
 #, fuzzy
-msgid "FIXME: _File..."
-msgstr "Sett inn fil ..."
+msgid "End of day:"
+msgstr "Slutt trekk"
 
-#: calendar/gui/dialogs/task-editor.c:535 calendar/gui/event-editor.c:1279
-msgid "FIXME: It_em..."
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:536 calendar/gui/event-editor.c:1280
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "Fre"
+
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
 #, fuzzy
-msgid "FIXME: _Object..."
-msgstr "&Objekt ..."
+msgid "Friday"
+msgstr "Fredag"
 
-#: calendar/gui/dialogs/task-editor.c:541 calendar/gui/event-editor.c:1285
+#: po/tmp/cal-prefs-dialog.glade.h:29
 #, fuzzy
-msgid "FIXME: _Font..."
-msgstr "Skrifttype ..."
+msgid "Highlight"
+msgstr "Opplysing:"
 
-#: calendar/gui/dialogs/task-editor.c:542 calendar/gui/event-editor.c:1286
+#: po/tmp/cal-prefs-dialog.glade.h:30
 #, fuzzy
-msgid "FIXME: _Paragraph..."
-msgstr "&Avsnitt ..."
+msgid "Items Due Today"
+msgstr "&Opplys syntaks"
 
-#: calendar/gui/dialogs/task-editor.c:549 calendar/gui/event-editor.c:1293
-msgid "FIXME: Desi_gn This Form"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:550 calendar/gui/event-editor.c:1294
-msgid "FIXME: D_esign a Form..."
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:552 calendar/gui/event-editor.c:1296
-msgid "FIXME: Publish _Form..."
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:553 calendar/gui/event-editor.c:1297
-msgid "FIXME: Pu_blish Form As..."
-msgstr ""
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "Mц╔n"
 
-#: calendar/gui/dialogs/task-editor.c:555 calendar/gui/event-editor.c:1299
-msgid "FIXME: Script _Debugger"
-msgstr ""
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Mц╔ndag"
 
-#: calendar/gui/dialogs/task-editor.c:560 calendar/gui/event-editor.c:1304
+#: po/tmp/cal-prefs-dialog.glade.h:36
 #, fuzzy
-msgid "FIXME: _Spelling..."
-msgstr "&Stavekontroll ..."
+msgid "Overdue Items"
+msgstr "&Syntaksmerkingsmodusar"
 
-#: calendar/gui/dialogs/task-editor.c:562 calendar/gui/event-editor.c:1306
-msgid "FIXME: Chec_k Names"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:563 calendar/gui/event-editor.c:1307
-#, fuzzy
-msgid "FIXME: Address _Book..."
-msgstr "Adresse&bok ..."
-
-#: calendar/gui/dialogs/task-editor.c:565 calendar/gui/event-editor.c:1309
-#, fuzzy
-msgid "_Forms"
-msgstr "Forum"
-
-#: calendar/gui/dialogs/task-editor.c:570
-#, fuzzy
-msgid "FIXME: _New Task"
-msgstr "Ny oppgц╔ve"
-
-#: calendar/gui/dialogs/task-editor.c:572
-msgid "FIXME: S_end Status Report"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:573
-msgid "FIXME: _Mark Complete"
-msgstr ""
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "Prioritet"
 
-#: calendar/gui/dialogs/task-editor.c:575 calendar/gui/event-editor.c:1316
+#: po/tmp/cal-prefs-dialog.glade.h:40
 #, fuzzy
-msgid "FIXME: Rec_urrence..."
-msgstr "Repetering"
+msgid "Remind me of all appointments"
+msgstr "&Slett avtale"
 
-#: calendar/gui/dialogs/task-editor.c:576
+#: po/tmp/cal-prefs-dialog.glade.h:41
 #, fuzzy
-msgid "FIXME: S_kip Occurrence"
-msgstr "Fц╦rekomst"
-
-#: calendar/gui/dialogs/task-editor.c:578
-msgid "FIXME: Assig_n Task"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:580
-msgid "FIXME: _Reply"
-msgstr ""
+msgid "Reminders"
+msgstr "Pц╔minning:"
 
-#: calendar/gui/dialogs/task-editor.c:581
-#, fuzzy
-msgid "FIXME: Reply to A_ll"
-msgstr "Svar til alle:"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "Lau"
 
-#: calendar/gui/dialogs/task-editor.c:582 calendar/gui/event-editor.c:1321
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
 #, fuzzy
-msgid "FIXME: For_ward"
-msgstr "Fort framover"
+msgid "Saturday"
+msgstr "Laurdag"
 
-#: calendar/gui/dialogs/task-editor.c:595 calendar/gui/event-editor.c:1334
-#, fuzzy
-msgid "_Insert"
-msgstr "Set inn"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:596 calendar/gui/event-editor.c:1335
-#: composer/e-msg-composer.c:1022
+#: po/tmp/cal-prefs-dialog.glade.h:45
 #, fuzzy
-msgid "F_ormat"
-msgstr "Format"
+msgid "Show appointment end times"
+msgstr "Avtale"
 
-#: calendar/gui/dialogs/task-editor.c:597 calendar/gui/event-editor.c:1336
+#: po/tmp/cal-prefs-dialog.glade.h:46
 #, fuzzy
-msgid "_Tools"
-msgstr "Verktц╦y"
+msgid "Show week numbers"
+msgstr "Vis %1"
 
-#: calendar/gui/dialogs/task-editor.c:598 calendar/gui/event-editor.c:1337
+#: po/tmp/cal-prefs-dialog.glade.h:47
 #, fuzzy
-msgid "Actio_ns"
-msgstr "Handlingar"
+msgid "Start of day:"
+msgstr "Start-dato"
 
-#: calendar/gui/dialogs/task-editor.c:624 calendar/gui/event-editor.c:1362
-#, fuzzy
-msgid "Save and Close"
-msgstr "Lagra ei fil"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "Sun"
 
-#: calendar/gui/dialogs/task-editor.c:625
-msgid "Save the task and close the dialog box"
-msgstr ""
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Sundag"
 
-#: calendar/gui/dialogs/task-editor.c:629 calendar/gui/event-editor.c:1379
+#: po/tmp/cal-prefs-dialog.glade.h:50
 #, fuzzy
-msgid "FIXME: Print..."
-msgstr "Skriv &ut ..."
+msgid "TaskPad"
+msgstr "Oppgц╔ve"
 
-#: calendar/gui/dialogs/task-editor.c:630 calendar/gui/event-editor.c:1380
-#, fuzzy
-msgid "Print this item"
-msgstr "Skriv til fil"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "Tor"
 
-#: calendar/gui/dialogs/task-editor.c:633 calendar/gui/event-editor.c:1385
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
 #, fuzzy
-msgid "FIXME: Insert File..."
-msgstr "Sett inn fil ..."
+msgid "Thursday"
+msgstr "Torsdag"
 
-#: calendar/gui/dialogs/task-editor.c:634 calendar/gui/event-editor.c:1386
+#: po/tmp/cal-prefs-dialog.glade.h:53
 #, fuzzy
-msgid "Insert a file as an attachment"
-msgstr "Meldinga har vedlegg"
-
-#: calendar/gui/dialogs/task-editor.c:639
-msgid "FIXME: Assign Task..."
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:640
-msgid "Assign the task to someone"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:644 calendar/gui/e-calendar-table.c:324
-#: calendar/gui/event-editor-dialog.glade.h:92
-#: calendar/gui/event-editor.c:1367 mail/mail-config.glade.h:13
-#: mail/mail-config.glade.h:18 mail/mail-config.glade.h:24
-#: mail/mail-view.c:163
-msgid "Delete"
-msgstr "Slett"
+msgid "Time Until Due"
+msgstr "Tid og dato"
 
-#: calendar/gui/dialogs/task-editor.c:645
+#: po/tmp/cal-prefs-dialog.glade.h:54
 #, fuzzy
-msgid "Delete this task"
-msgstr "Slett denne adressa"
+msgid "Time divisions:"
+msgstr "Dimensjonar"
 
-#: calendar/gui/dialogs/task-editor.c:649 calendar/gui/event-editor.c:1396
+#: po/tmp/cal-prefs-dialog.glade.h:55
 #, fuzzy
-msgid "FIXME: Previous"
-msgstr "Fц╦rre"
+msgid "Time format:"
+msgstr "Tidsformat:"
 
-#: calendar/gui/dialogs/task-editor.c:650 calendar/gui/event-editor.c:1397
-#, fuzzy
-msgid "Go to the previous item"
-msgstr "Gц╔ til neste som treng ettersyn"
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "Tys"
 
-#: calendar/gui/dialogs/task-editor.c:653 calendar/gui/event-editor.c:1399
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
 #, fuzzy
-msgid "FIXME: Next"
-msgstr "Finn neste"
+msgid "Tuesday"
+msgstr "Tysdag"
 
-#: calendar/gui/dialogs/task-editor.c:654 calendar/gui/event-editor.c:1400
+#: po/tmp/cal-prefs-dialog.glade.h:58
 #, fuzzy
-msgid "Go to the next item"
-msgstr "Ikkje vis den overskytande teksten"
+msgid "Visual Alarms"
+msgstr "Alarm"
 
-#: calendar/gui/dialogs/task-editor.c:657 calendar/gui/event-editor.c:1402
-#, fuzzy
-msgid "FIXME: Help"
-msgstr "&KDE-hjelp"
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "Ons"
 
-#: calendar/gui/dialogs/task-editor.c:658 calendar/gui/event-editor.c:1403
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
 #, fuzzy
-msgid "See online help"
-msgstr "Me er tilkopla!"
-
-#: calendar/gui/dialogs/task-editor.c:913
-msgid "Edit Task"
-msgstr "Rediger oppgц╔ve"
+msgid "Wednesday"
+msgstr "Onsdag"
 
-#: calendar/gui/dialogs/task-editor.c:919 calendar/gui/event-editor.c:285
+#: po/tmp/cal-prefs-dialog.glade.h:61
 #, fuzzy
-msgid "No summary"
-msgstr "oppsummering"
-
-#: calendar/gui/dialogs/task-editor.c:925 calendar/gui/event-editor.c:291
-#, fuzzy, c-format
-msgid "Appointment - %s"
-msgstr "Avtale"
-
-#: calendar/gui/dialogs/task-editor.c:928 calendar/gui/event-editor.c:294
-#, fuzzy, c-format
-msgid "Task - %s"
-msgstr "Oppgц╔ver"
+msgid "Work week"
+msgstr "Veke"
 
-#: calendar/gui/dialogs/task-editor.c:931 calendar/gui/event-editor.c:297
-#, c-format
-msgid "Journal entry - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
 msgstr ""
 
+#: po/tmp/cal-prefs-dialog.glade.h:63
+#, fuzzy
+msgid "seconds."
+msgstr "sekund"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
+#: po/tmp/task-editor-dialog.glade.h:6
 #, fuzzy
-msgid "S_ummary"
-msgstr "Samandrag"
+msgid "% Comp_lete:"
+msgstr "Ferdig"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
+#: po/tmp/task-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Sta_rt Date:"
-msgstr "Start-dato:"
+msgid "C_lassification:"
+msgstr "&Forstц╦rring"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
+#: po/tmp/task-editor-dialog.glade.h:9
 #, fuzzy
-msgid "_Due Date:"
-msgstr "Forfallsdato:"
+msgid "Cancelled"
+msgstr "Avbroten."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
-#, fuzzy
-msgid "% Comp_lete:"
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
 msgstr "Ferdig"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
+#: po/tmp/task-editor-dialog.glade.h:12
 #, fuzzy
-msgid "_Status:"
-msgstr "Status:"
+msgid "Date Completed:"
+msgstr "Ferdig"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
+#: po/tmp/task-editor-dialog.glade.h:14
 #, fuzzy
-msgid "Not Started"
-msgstr "Starta"
+msgid "High"
+msgstr "Hц╦gd"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
+#: po/tmp/task-editor-dialog.glade.h:15
 #, fuzzy
 msgid "In Progress"
 msgstr "Framgong:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
-msgid "Completed"
-msgstr "Ferdig"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
+#: po/tmp/task-editor-dialog.glade.h:16
 #, fuzzy
-msgid "Cancelled"
-msgstr "Avbroten."
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-#, fuzzy
-msgid "_Priority:"
-msgstr "Prioritet:"
+msgid "Low"
+msgstr "Senk"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
-msgid "High"
-msgstr "Hц╦gd"
+#. 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
+msgid "None"
+msgstr "Ingen"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
+#: po/tmp/task-editor-dialog.glade.h:18
 msgid "Normal"
 msgstr "Normal"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:19
 #, fuzzy
-msgid "Low"
-msgstr "Senk"
+msgid "Not Started"
+msgstr "Starta"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: po/tmp/task-editor-dialog.glade.h:22
 #, fuzzy
-msgid "C_lassification:"
-msgstr "&Forstц╦rring"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:992
-#: widgets/misc/e-dateedit.c:332 widgets/misc/e-dateedit.c:704
-#: widgets/misc/e-dateedit.c:1027
-msgid "None"
-msgstr "Ingen"
+msgid "S_ummary"
+msgstr "Samandrag"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: po/tmp/task-editor-dialog.glade.h:23
 #, fuzzy
-msgid "_Contacts..."
-msgstr "&Innhald ..."
+msgid "Sta_rt Date:"
+msgstr "Start-dato:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Oppgц╔ve"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-#, fuzzy
-msgid "Date Completed:"
-msgstr "Ferdig"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#. Create the header columns
-#: calendar/gui/e-calendar-table.c:196
-msgid "Categories"
-msgstr "Kategoriar"
-
-#: calendar/gui/e-calendar-table.c:197
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: po/tmp/task-editor-dialog.glade.h:26
 #, fuzzy
-msgid "Classification"
-msgstr "&Forstц╦rring"
+msgid "_Contacts..."
+msgstr "&Innhald ..."
 
-#: calendar/gui/e-calendar-table.c:198
+#: po/tmp/task-editor-dialog.glade.h:27
 #, fuzzy
-msgid "Completion date"
-msgstr "Fullfц╦ring"
+msgid "_Due Date:"
+msgstr "Forfallsdato:"
 
-#: calendar/gui/e-calendar-table.c:199
+#: po/tmp/task-editor-dialog.glade.h:28
 #, fuzzy
-msgid "End date"
-msgstr "Slutt-dato"
+msgid "_Priority:"
+msgstr "Prioritet:"
 
-#: calendar/gui/e-calendar-table.c:200
+#: po/tmp/task-editor-dialog.glade.h:29
 #, fuzzy
-msgid "Start date"
-msgstr "Start-dato"
+msgid "_Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-calendar-table.c:201
-#, fuzzy
-msgid "Due date"
-msgstr "Forfallsdato"
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:202
-#, fuzzy
-msgid "Geographical position"
-msgstr "Etikettplassering"
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Rediger oppgц╔ve"
 
-#: calendar/gui/e-calendar-table.c:203
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
 #, fuzzy
-msgid "Percent complete"
-msgstr "Prosentformat"
-
-#: calendar/gui/e-calendar-table.c:204 calendar/gui/prop.c:611
-msgid "Priority"
-msgstr "Prioritet"
+msgid "No summary"
+msgstr "oppsummering"
 
-#: calendar/gui/e-calendar-table.c:212
-msgid "Summary"
-msgstr "Samandrag"
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, fuzzy, c-format
+msgid "Appointment - %s"
+msgstr "Avtale"
 
-#: calendar/gui/e-calendar-table.c:216
-#, fuzzy
-msgid "Transparency"
-msgstr "Gjennomsiktig "
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, fuzzy, c-format
+msgid "Task - %s"
+msgstr "Oppgц╔ver"
 
-#: calendar/gui/e-calendar-table.c:217
-msgid "URL"
-msgstr "URL"
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
 
-#: calendar/gui/e-calendar-table.c:219 calendar/gui/prop.c:786
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
 #, fuzzy
-msgid "Alarms"
-msgstr "Alarm"
+msgid "Do you want to save changes?"
+msgstr "I ferd med ц╔ senda e-post ..."
 
-#: calendar/gui/e-calendar-table.c:318
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Opna ..."
 
-#: calendar/gui/e-calendar-table.c:319
+#: calendar/gui/e-calendar-table.c:337
 #, fuzzy
 msgid "Open the task"
 msgstr "Opna med %1"
 
-#: calendar/gui/e-calendar-table.c:321
+#: calendar/gui/e-calendar-table.c:339
 #, fuzzy
 msgid "Mark Complete"
 msgstr "Ferdig"
 
-#: calendar/gui/e-calendar-table.c:322
+#: calendar/gui/e-calendar-table.c:340
 #, fuzzy
 msgid "Mark the task complete"
 msgstr "Marker alle som l&esne"
 
-#: calendar/gui/e-calendar-table.c:325
+#: 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"
 msgstr "Slett denne adressa"
 
-#: calendar/gui/e-day-view-time-item.c:393
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: 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.c:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: 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.c:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-week-view-main-item.c:348
 #, fuzzy
 msgid "%d %b"
 msgstr "%1 %2"
 
-#: calendar/gui/e-day-view.c:2571 calendar/gui/e-day-view.c:2578
-#: calendar/gui/e-day-view.c:2587 calendar/gui/e-week-view.c:2931
-#: calendar/gui/e-week-view.c:2938 calendar/gui/e-week-view.c:2947
+#: 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
 #, fuzzy
 msgid "New appointment..."
 msgstr "&Vis avtale ..."
 
-#: calendar/gui/e-day-view.c:2575 calendar/gui/e-day-view.c:2582
-#: calendar/gui/e-week-view.c:2935 calendar/gui/e-week-view.c:2942
+#: 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
 #, fuzzy
 msgid "Edit this appointment..."
 msgstr "&Endra avtale ..."
 
-#: calendar/gui/e-day-view.c:2576 calendar/gui/e-week-view.c:2936
-#: calendar/gui/event-editor.c:1368
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 #, fuzzy
 msgid "Delete this appointment"
 msgstr "&Slett avtale"
 
-#: calendar/gui/e-day-view.c:2583 calendar/gui/e-week-view.c:2943
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 #, fuzzy
 msgid "Make this appointment movable"
 msgstr "Se&nd avtale"
 
-#: calendar/gui/e-day-view.c:2584 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 #, fuzzy
 msgid "Delete this occurrence"
 msgstr "Erstatt denne fц╦rekomsten?"
 
-#: calendar/gui/e-day-view.c:2585 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 #, fuzzy
 msgid "Delete all occurrences"
 msgstr "Slettar klassen"
 
-#: calendar/gui/event-editor.c:279
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
 #, fuzzy
-msgid "Edit Appointment"
-msgstr "&Endra avtale ..."
+msgid "%d %B"
+msgstr "%1 %2"
 
-#: calendar/gui/event-editor.c:1260
-#, fuzzy
-msgid "FIXME: _Formatting"
-msgstr "Tekstformatering"
+#.
+#. * 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
+msgid "A_ll day event"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1271
+#: po/tmp/event-editor-dialog.glade.h:8
 #, fuzzy
-msgid "FIXME: Ca_lendar..."
-msgstr "&Slц╔ saman kalender ..."
+msgid "Appointment Basics"
+msgstr "Avtale"
 
-#: calendar/gui/event-editor.c:1314
+#: po/tmp/event-editor-dialog.glade.h:9
 #, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "Se&nd avtale"
+msgid "Classification"
+msgstr "&Forstц╦rring"
 
-#: calendar/gui/event-editor.c:1318
+#: po/tmp/event-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Schedule _Meeting..."
-msgstr "Kц╦yreplan ..."
-
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Forward as v_Calendar"
-msgstr ""
+msgid "Custom recurrence"
+msgstr "Repetering"
 
-#: calendar/gui/event-editor.c:1363
+#: po/tmp/event-editor-dialog.glade.h:11
 #, fuzzy
-msgid "Save and close this appointment"
-msgstr "&Slett avtale"
+msgid "Days"
+msgstr "Dag"
 
-#: calendar/gui/event-editor.c:1373
+#: po/tmp/event-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Close this appointment"
-msgstr "&Slett avtale"
-
-#: calendar/gui/event-editor.c:1389
-msgid "FIXME: Invite Attendees..."
-msgstr ""
+msgid "Every"
+msgstr "kvar"
 
-#: calendar/gui/event-editor.c:1390
-msgid "Invite attendees to a meeting"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Unntak"
 
-#: calendar/gui/event-editor.c:1947 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+#: po/tmp/event-editor-dialog.glade.h:16
 #, fuzzy
-msgid "%a %b %d %Y"
-msgstr "%1 bit %2 %3"
+msgid "Hours"
+msgstr "time/timar"
 
-#. todo
-#.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
+#: po/tmp/event-editor-dialog.glade.h:17
 #, fuzzy
-msgid "event-editor-dialog"
-msgstr "Opnar angrehistoriedialogen"
+msgid "Mail _to:"
+msgstr "E-post:"
 
-#: calendar/gui/event-editor-dialog.glade.h:8
+#: po/tmp/event-editor-dialog.glade.h:18
 #, fuzzy
-msgid "_Summary:"
-msgstr "Samandrag:"
+msgid "Minutes"
+msgstr "minutt"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "Tid"
+#: po/tmp/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Modify"
+msgstr "Mц╔ndag"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
+#: po/tmp/event-editor-dialog.glade.h:20
 #, fuzzy
-msgid "Start time:"
-msgstr "Start-tid:"
+msgid "No recurrence"
+msgstr "Repetering"
 
-#: calendar/gui/event-editor-dialog.glade.h:11
+#: po/tmp/event-editor-dialog.glade.h:21
 #, fuzzy
-msgid "End time:"
-msgstr "Slutt-tid:"
+msgid "Preview"
+msgstr "Fц╦rehandsvising:"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:22
+#, fuzzy
+msgid "Pri_vate"
+msgstr "Privat"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
+#: po/tmp/event-editor-dialog.glade.h:23
 #, fuzzy
 msgid "Pu_blic"
 msgstr "Praksis"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "Repetering"
+
+#: po/tmp/event-editor-dialog.glade.h:25
 #, fuzzy
-msgid "Pri_vate"
-msgstr "Privat"
+msgid "Recurrence Rule"
+msgstr "Regel for repetering"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
+#: po/tmp/event-editor-dialog.glade.h:26
 #, fuzzy
-msgid "_Confidential"
-msgstr "Eksponentiell"
+msgid "Reminder"
+msgstr "Pц╔minning:"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:27
+#, fuzzy
+msgid "Simple recurrence"
+msgstr "Repetering"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
+#: po/tmp/event-editor-dialog.glade.h:28
 #, fuzzy
-msgid "_Display"
-msgstr "Vis"
+msgid "Su_mmary:"
+msgstr "Samandrag:"
+
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Tid"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
+#: po/tmp/event-editor-dialog.glade.h:30
 #, fuzzy
 msgid "_Audio"
 msgstr "Lyd"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: po/tmp/event-editor-dialog.glade.h:31
 #, fuzzy
-msgid "_Program"
-msgstr "Program"
+msgid "_Confidential"
+msgstr "Eksponentiell"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
+#: po/tmp/event-editor-dialog.glade.h:32
 #, fuzzy
-msgid "_Mail"
-msgstr "Send"
+msgid "_Display"
+msgstr "Vis"
 
-#: calendar/gui/event-editor-dialog.glade.h:38
+#: po/tmp/event-editor-dialog.glade.h:33
 #, fuzzy
-msgid "Mail _to:"
-msgstr "E-post:"
+msgid "_End time:"
+msgstr "Slutt-tid:"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
+#: po/tmp/event-editor-dialog.glade.h:34
 #, fuzzy
-msgid "_Run program:"
-msgstr "Terminalprogram:"
+msgid "_Mail"
+msgstr "Send"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
+#: po/tmp/event-editor-dialog.glade.h:35
 #, fuzzy
-msgid "Reminder"
-msgstr "Pц╔minning:"
+msgid "_Program"
+msgstr "Program"
 
-#: calendar/gui/event-editor-dialog.glade.h:41
+#: po/tmp/event-editor-dialog.glade.h:36
 #, fuzzy
-msgid "Recurrence rule"
-msgstr "Regel for repetering"
-
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Daily"
-msgstr "Dagleg"
-
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Weekly"
-msgstr "Kvar veke"
-
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Monthly"
-msgstr "Kvar mц╔nad"
-
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Yearly"
-msgstr "Kvart ц╔r"
+msgid "_Run program:"
+msgstr "Terminalprogram:"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
+#: po/tmp/event-editor-dialog.glade.h:37
 #, fuzzy
-msgid "label23"
-msgstr "Etikett"
+msgid "_Start time:"
+msgstr "Start-tid:"
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-#: calendar/gui/event-editor-dialog.glade.h:51
-#: calendar/gui/event-editor-dialog.glade.h:81
+#: po/tmp/event-editor-dialog.glade.h:38
 #, fuzzy
-msgid "Every "
-msgstr "kvar"
+msgid "_Starting date:"
+msgstr "Start-dato"
 
-#: calendar/gui/event-editor-dialog.glade.h:49
+#: po/tmp/event-editor-dialog.glade.h:39
 msgid "day(s)"
 msgstr "dag(ar)"
 
-#: calendar/gui/event-editor-dialog.glade.h:50
+#: po/tmp/event-editor-dialog.glade.h:40
 #, fuzzy
-msgid "label24"
-msgstr "Etikett"
+msgid "event-editor-dialog"
+msgstr "Opnar angrehistoriedialogen"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
+#: po/tmp/event-editor-dialog.glade.h:41
 #, fuzzy
-msgid "week(s)"
-msgstr "veke(r) pц╔:"
-
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Mц╔n"
-
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Tys"
-
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Ons"
-
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Tor"
-
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Fre"
-
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Lau"
+msgid "for"
+msgstr "Munnar"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Sun"
+#: po/tmp/event-editor-dialog.glade.h:42
+#, fuzzy
+msgid "forever"
+msgstr "Repeterer for alltid"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
+#: po/tmp/event-editor-dialog.glade.h:43
 #, fuzzy
-msgid "label25"
+msgid "label21"
 msgstr "Etikett"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Recur on the"
-msgstr "Repeter pц╔ den"
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "mц╔nad(er)"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
+#: po/tmp/event-editor-dialog.glade.h:45
 #, fuzzy
-msgid "th day of the month"
-msgstr "Dagar i mц╔naden"
-
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
-msgstr ""
-
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
-msgstr ""
+msgid "until"
+msgstr "utan tittel"
 
-#: calendar/gui/event-editor-dialog.glade.h:78
+#: po/tmp/event-editor-dialog.glade.h:46
 #, fuzzy
-msgid "Every"
-msgstr "kvar"
-
-#: calendar/gui/event-editor-dialog.glade.h:79
-msgid "month(s)"
-msgstr "mц╔nad(er)"
+msgid "week(s)"
+msgstr "veke(r) pц╔:"
 
-#: calendar/gui/event-editor-dialog.glade.h:82
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "ц╔r"
 
-#: calendar/gui/event-editor-dialog.glade.h:83
+#: calendar/gui/event-editor.c:329
 #, fuzzy
-msgid "label27"
-msgstr "Nivц╔ 27"
+msgid "Edit Appointment"
+msgstr "&Endra avtale ..."
 
-#: calendar/gui/event-editor-dialog.glade.h:84
+#: calendar/gui/event-editor.c:407
 #, fuzzy
-msgid "Ending date"
-msgstr "Ingen slutt-dato"
+msgid "on"
+msgstr "Mц╔n"
 
-#: calendar/gui/event-editor-dialog.glade.h:85
-#, fuzzy
-msgid "Repeat forever"
-msgstr "Repeterer for alltid"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dagen"
 
-#: calendar/gui/event-editor-dialog.glade.h:86
+#: calendar/gui/event-editor.c:559
 #, fuzzy
-msgid "End on "
-msgstr "Slutt trekk"
+msgid "on the"
+msgstr "Mц╔nad"
 
-#: calendar/gui/event-editor-dialog.glade.h:87
-msgid "End after"
-msgstr "Slutt etter"
+#: calendar/gui/event-editor.c:566
+#, fuzzy
+msgid "th"
+msgstr "4."
 
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "occurrence(s)"
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
 msgstr "gong(ar)"
 
-#: calendar/gui/event-editor-dialog.glade.h:89
-msgid "Exceptions"
-msgstr "Unntak"
-
-#: calendar/gui/event-editor-dialog.glade.h:91
-msgid "Change"
-msgstr "Endra"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "Recurrence"
-msgstr "Repetering"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+#, fuzzy
+msgid "%a %b %d %Y"
+msgstr "%1 bit %2 %3"
 
 #: calendar/gui/getdate.y:391
 #, fuzzy
@@ -2453,12 +2403,12 @@ msgstr "Fredag"
 msgid "saturday"
 msgstr "Laurdag"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 #, fuzzy
 msgid "year"
 msgstr "ц┘r"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 #, fuzzy
 msgid "month"
 msgstr "Mц╔nad"
@@ -2468,21 +2418,17 @@ msgstr "Mц╔nad"
 msgid "fortnight"
 msgstr "hц╦gre"
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 #, fuzzy
 msgid "week"
 msgstr "Veke"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr "dagen"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: 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:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 #, fuzzy
 msgid "minute"
 msgstr "minutt"
@@ -2492,7 +2438,7 @@ msgstr "minutt"
 msgid "min"
 msgstr " min"
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 #, fuzzy
 msgid "second"
 msgstr "sekund"
@@ -2516,8 +2462,8 @@ msgstr "kvar dag"
 msgid "today"
 msgstr "i dag"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 #, fuzzy
 msgid "now"
 msgstr "nei"
@@ -2597,55 +2543,29 @@ msgstr ""
 msgid "ago"
 msgstr "Tag"
 
-#: calendar/gui/gncal-todo.c:139
-#, fuzzy
-msgid "Create to-do item"
-msgstr "Lag mappe"
-
-#: calendar/gui/gncal-todo.c:139
-#, fuzzy
-msgid "Edit to-do item"
-msgstr "Rediger punkt"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Samandrag:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "Forfallsdato:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Prioritet:"
-
-#: calendar/gui/gncal-todo.c:219
-#, fuzzy
-msgid "Item Comments:"
-msgstr "Kommentar:"
-
-#: calendar/gui/gnome-cal.c:697 calendar/gui/gnome-cal.c:1435
-#: calendar/gui/gnome-cal.c:1491
+#: 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:1131
+#: 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:1142
+#: 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:1153
+#: 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:1440 calendar/gui/gnome-cal.c:1495
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Ok"
 
@@ -2869,401 +2789,978 @@ msgstr "Gjeldande: %1"
 msgid "Print Calendar"
 msgstr "Skriv ut alle"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:794
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 #, fuzzy
 msgid "Print Preview"
 msgstr "&Fц╦rehandsvising ..."
 
-#: calendar/gui/prop.c:336
-#, fuzzy
-msgid "Time display"
-msgstr "Endra tidsvising"
+#. 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 ""
 
-#. Time format
-#: calendar/gui/prop.c:340
-#, fuzzy
-msgid "Time format"
-msgstr "Tidsformat:"
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+msgid "SMTWTFS"
+msgstr ""
 
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, fuzzy, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: calendar/gui/prop.c:342
-msgid "24-hour"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#. Weeks start on
-#: calendar/gui/prop.c:352
-#, fuzzy
-msgid "Weeks start on"
-msgstr " start"
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
 
-#: calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Sundag"
+#: camel/camel-movemail.c:99
+#, fuzzy, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Mц╔ndag"
+#: camel/camel-movemail.c:146
+#, fuzzy, c-format
+msgid "Could not open mail file %s: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/camel-movemail.c:156
+#, fuzzy, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
+
+#: camel/camel-movemail.c:197
+#, fuzzy, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/camel-movemail.c:243
+#, fuzzy, c-format
+msgid "Error reading mail file: %s"
+msgstr ""
+"Feil ved nedlasting av fil:\n"
+"%1"
 
-#. Day range
-#: calendar/gui/prop.c:364
+#: camel/camel-movemail.c:254
+#, fuzzy, c-format
+msgid "Error writing mail temp file: %s"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
+
+#: camel/camel-movemail.c:272
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:304
+#, fuzzy, c-format
+msgid "Could not create pipe: %s"
+msgstr "Kunne ikkje laga katalog\n"
+
+#: camel/camel-movemail.c:316
+#, fuzzy, c-format
+msgid "Could not fork: %s"
+msgstr "Kunne ikkje starta %1."
+
+#: camel/camel-movemail.c:354
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:355
 #, fuzzy
-msgid "Day range"
-msgstr "Dato-omrц╔de"
+msgid "(Unknown error)"
+msgstr "Ukjend feil"
+
+#: camel/camel-provider.c:133
+#, fuzzy, c-format
+msgid "Could not load %s: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr ""
+
+#: camel/camel-remote-store.c:182
+#, fuzzy, c-format
+msgid "%s server %s"
+msgstr "Diskusjonsgruppetenarar"
+
+#: camel/camel-remote-store.c:186
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:227
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
 
-#: calendar/gui/prop.c:375
+#: camel/camel-remote-store.c:228
+msgid "(unknown host)"
+msgstr ""
+
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr ""
+
+#: camel/camel-service.c:129
+#, c-format
+msgid "URL '%s' needs a host component"
+msgstr ""
+
+#: camel/camel-service.c:138
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr ""
+
+#: camel/camel-service.c:488
+#, c-format
+msgid "No such host %s."
+msgstr ""
+
+#: camel/camel-service.c:491
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr ""
+
+#: camel/camel-session.c:272
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
+
+#: camel/camel-session.c:360
+#, fuzzy, c-format
 msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
+"Could not create directory %s:\n"
+"%s"
 msgstr ""
+"Kan ikkje laga heimekatalog\n"
+"Feil: %1"
 
-#: calendar/gui/prop.c:391
-#, fuzzy
-msgid "Day start:"
-msgstr " start"
+#: camel/camel-url.c:78
+#, c-format
+msgid "URL string `%s' contains no protocol"
+msgstr ""
 
-#: calendar/gui/prop.c:402
-#, fuzzy
-msgid "Day end:"
-msgstr "Dag:"
+#: camel/camel-url.c:93
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
+msgstr ""
 
-#: calendar/gui/prop.c:525
-#, fuzzy
-msgid "Colors for display"
-msgstr "Farge eller pixmap"
+#: camel/camel-url.c:154
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
+msgstr ""
 
-#: calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Fargar"
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
 
-#: calendar/gui/prop.c:605
-#, fuzzy
-msgid "Show on TODO List:"
-msgstr "Vis lang gruppeliste"
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr ""
 
-#: calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Forfallsdato"
+#: camel/providers/imap/camel-imap-command.c:216
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "Slett e-post frц╔ tenaren"
 
-#: calendar/gui/prop.c:612
-#, fuzzy
-msgid "Time Until Due"
-msgstr "Tid og dato"
+#: camel/providers/imap/camel-imap-command.c:224
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr ""
 
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+msgid "Unknown error"
+msgstr "Ukjend feil"
+
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
 msgstr ""
 
-#: calendar/gui/prop.c:648
-#, fuzzy
-msgid "Highlight overdue items"
-msgstr "&Syntaksmerkingsmodusar"
+#: camel/providers/imap/camel-imap-command.c:407
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr ""
 
-#: calendar/gui/prop.c:651
-#, fuzzy
-msgid "Highlight not yet due items"
-msgstr "&Syntaksmerkingsmodusar"
+#: camel/providers/imap/camel-imap-command.c:443
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr ""
 
-#: calendar/gui/prop.c:654
-#, fuzzy
-msgid "Highlight items due today"
-msgstr "&Opplys syntaks"
+#: camel/providers/imap/camel-imap-folder.c:216
+#, fuzzy, c-format
+msgid "Could not load summary for %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
 
-#: calendar/gui/prop.c:684
-#, fuzzy
-msgid "To Do List Properties"
-msgstr "Linjeeigenskapar"
+#: camel/providers/imap/camel-imap-folder.c:586
+msgid "Could not find message body in FETCH response."
+msgstr ""
 
-#: calendar/gui/prop.c:687
-#, fuzzy
-msgid "To Do List"
-msgstr "Hugseliste"
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
+msgstr ""
 
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Innstillingar"
+#: camel/providers/imap/camel-imap-provider.c:41
+msgid "For reading and storing mail on IMAP servers."
+msgstr ""
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-#, fuzzy
-msgid "Alarm Properties"
-msgstr "Rammeeigenskapar ..."
+#: 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 ""
 
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
+#: camel/providers/imap/camel-imap-store.c:236
+msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
 msgstr ""
 
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-#, fuzzy
-msgid " seconds"
-msgstr "sekund"
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
+msgstr ""
 
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
+#: camel/providers/imap/camel-imap-store.c:333
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Standard"
+#: camel/providers/imap/camel-imap-store.c:359
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:186
-msgid "Cut"
-msgstr "Klipp ut"
+#: camel/providers/imap/camel-imap-store.c:539
+#, fuzzy, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+"Kan ikkje laga heimekatalog\n"
+"Feil: %1"
 
-#: composer/e-msg-composer-address-dialog.c:187
-#, fuzzy
-msgid "Cut selected item into clipboard"
-msgstr "Kopierer utvalet til utklippstavla"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:190
-msgid "Copy"
-msgstr "Kopier"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:191
-#, fuzzy
-msgid "Copy selected item into clipboard"
-msgstr "Kopierer utvalet til utklippstavla"
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:194
-#: composer/e-msg-composer-address-dialog.c:202
-msgid "Paste"
-msgstr "Lim inn"
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:195
-#: composer/e-msg-composer-address-dialog.c:203
-#, fuzzy
-msgid "Paste item from clipboard"
-msgstr "Limer inn ..."
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:529
-#, fuzzy
-msgid "Select recipients' addresses"
-msgstr "Slett denne adressa"
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+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.
-#.
-#: composer/e-msg-composer-address-dialog.glade.h:7
-#, fuzzy
-msgid "Recipient list:"
-msgstr "Nyleg brukte fargar"
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:9
-msgid "Search..."
-msgstr "Sц╦k ..."
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "er ei vanleg fil"
 
-#: composer/e-msg-composer-address-dialog.glade.h:10
-msgid "Name"
-msgstr "Namn"
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Leitar etter tilleggsmodular"
 
-#: composer/e-msg-composer-address-dialog.glade.h:11
-#: mail/mail-config.glade.h:8
-msgid "Address"
-msgstr "Adresse"
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:12
-msgid "Properties..."
-msgstr "Eigenskapar ..."
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "Legg til ..."
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:14
-#, fuzzy
-msgid "To: >>"
-msgstr "Til:"
+#: camel/providers/local/camel-local-store.c:200
+#, fuzzy, c-format
+msgid "Local mail file %s"
+msgstr ""
+"Feil ved lesing a fil:\n"
+"%1"
 
-#: composer/e-msg-composer-address-dialog.glade.h:15
-#, fuzzy
-msgid "Cc: >>"
-msgstr "Cc:"
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
 
-#: composer/e-msg-composer-address-dialog.glade.h:16
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+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-mh-folder.c:183
 #, fuzzy
-msgid "Bcc: >>"
-msgstr "Bcc:"
+msgid "No such message"
+msgstr "Vidaresendt melding"
 
-#: composer/e-msg-composer-address-dialog.glade.h:17
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
+#, fuzzy, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+"Kan ikkje fjerna post frц╔\n"
+"postboksen '%1':\n"
+"%2"
+
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
+#, fuzzy, c-format
+msgid "Folder `%s' does not exist."
+msgstr "Fila finst ikkje\n"
+
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, fuzzy, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, fuzzy, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr ""
+"Kan ikkje fjerna post frц╔\n"
+"postboksen '%1':\n"
+"%2"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, 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
+#, 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
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, fuzzy, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Kan ikkje fjerna post frц╔\n"
+"postboksen '%1':\n"
+"%2"
+
+#: camel/providers/local/camel-mbox-store.c:117
+#, fuzzy, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
+#, fuzzy, c-format
+msgid "`%s' is not a regular file."
+msgstr "er ei vanleg fil"
+
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
+#, fuzzy, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/local/camel-mbox-store.c:160
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:234
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:341
+#, 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
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:491
+#, fuzzy, c-format
+msgid "Cannot open temporary mailbox: %s"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:562
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:579
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Could not rename folder: %s"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/local/camel-mbox-summary.c:817
+#, fuzzy, c-format
+msgid "Unknown error: %s"
+msgstr "Ukjend feil"
+
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Mottek meldingar frц╔ %1"
+
+#: camel/providers/local/camel-mh-store.c:116
+#, c-format
+msgid "`%s' is not a directory."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: 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:144
+#, fuzzy, c-format
+msgid "Message %s not found."
+msgstr "Fann ikkje fil"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 #, fuzzy
-msgid "label9"
-msgstr "Etikett"
+msgid "Could not get group list from server."
+msgstr "Kunne ikkje starta underprosess."
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-provider.c:38
+msgid "USENET news"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:18
+#: 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
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:179
+msgid "Could not open folder: message listing was incomplete."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:273
+#, fuzzy, c-format
+msgid "No message with uid %s"
+msgstr "Lag meldingar og slц╔ saman"
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, fuzzy, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr "Slett e-post frц╔ tenaren"
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:150
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:160
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:172
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:217
+#, fuzzy, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr "Kunne ikkje starta underprosess."
+
+#: camel/providers/pop3/camel-pop3-store.c:335
+#, 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
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, 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
 #, fuzzy
-msgid "label7"
-msgstr "Etikett"
+msgid "(Unknown)"
+msgstr "Ukjend"
+
+#: camel/providers/pop3/camel-pop3-store.c:438
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:446
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:555
+#, c-format
+msgid "No such folder `%s'."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:19
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
 #, fuzzy
-msgid "label8"
-msgstr "Etikett"
+msgid "Sendmail"
+msgstr "Send"
 
-#: composer/e-msg-composer-attachment-bar.c:82
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, fuzzy, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr "Kunne ikkje lasta kalender '%1'.\n"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, fuzzy, c-format
+msgid "Could not send message: %s"
+msgstr "Vidaresendt melding frц╔ %1"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+msgid "sendmail"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:30
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: composer/e-msg-composer-attachment-bar.c:87
 #, fuzzy
 msgid "1 byte"
 msgstr "%1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:84
+#: composer/e-msg-composer-attachment-bar.c:89
 #, fuzzy, c-format
 msgid "%u bytes"
 msgstr "%1 byte ="
 
-#: composer/e-msg-composer-attachment-bar.c:91
+#: composer/e-msg-composer-attachment-bar.c:96
 #, fuzzy, c-format
 msgid "%.1fK"
 msgstr "%1 KB"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:100
 #, fuzzy, c-format
 msgid "%.1fM"
 msgstr "%1 MB"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:104
 #, fuzzy, c-format
 msgid "%.1fG"
 msgstr "%1 GB"
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 #, fuzzy
-msgid "Add attachment"
+msgid "attachment"
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:459 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/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
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Fjern"
 
-#: composer/e-msg-composer-attachment-bar.c:460
+#: composer/e-msg-composer-attachment-bar.c:465
 #, fuzzy
 msgid "Remove selected items from the attachment list"
 msgstr "Fjern det valte programmet frц╔ lista"
 
-#: composer/e-msg-composer-attachment-bar.c:491
+#: composer/e-msg-composer-attachment-bar.c:496
 #, fuzzy
 msgid "Add attachment..."
 msgstr "Vedlegg"
 
-#: composer/e-msg-composer-attachment-bar.c:492
+#: composer/e-msg-composer-attachment-bar.c:497
 #, fuzzy
 msgid "Attach a file to the message"
 msgstr "Kunne ikkje lagra melding(ar)."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 #, fuzzy
 msgid "Attachment properties"
 msgstr "Vedleggseigenskapar"
 
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:8
+msgid "File name:"
+msgstr "Filnamn:"
+
+#: po/tmp/e-msg-composer-attachment.glade.h:9
 #, fuzzy
 msgid "MIME type:"
 msgstr "MIME-type"
 
-#: composer/e-msg-composer-attachment.glade.h:10
-msgid "File name:"
-msgstr "Filnamn:"
-
-#: composer/e-msg-composer-hdrs.c:138 composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "Frц╔:"
 
-#: composer/e-msg-composer-hdrs.c:244
+#: composer/e-msg-composer-hdrs.c:238
 #, fuzzy
 msgid "Click here for the address book"
 msgstr "Legg adresse til adresseboka"
 
-#: composer/e-msg-composer-hdrs.c:297
+#: composer/e-msg-composer-hdrs.c:291
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Til:"
 
-#: composer/e-msg-composer-hdrs.c:302
+#: composer/e-msg-composer-hdrs.c:296
 #, fuzzy
 msgid "Enter the recipients of the message"
 msgstr "Oppgi eit nytt namn pц╔ meldinga."
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 #, fuzzy
 msgid "Cc:"
 msgstr "&CC:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:306
 #, fuzzy
 msgid "Bcc:"
 msgstr "&Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:313
+#: composer/e-msg-composer-hdrs.c:307
 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:319
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Emne:"
 
-#: composer/e-msg-composer-hdrs.c:320
+#: composer/e-msg-composer-hdrs.c:314
 #, fuzzy
 msgid "Enter the subject of the mail"
 msgstr "Oppgi typen til medlemsvariabelen her."
 
-#: composer/e-msg-composer.c:468
+#: composer/e-msg-composer.c:429
+#, fuzzy, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+"Kan ikkje fjerna post frц╔\n"
+"postboksen '%1':\n"
+"%2"
+
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: composer/e-msg-composer.c:479
+#: composer/e-msg-composer.c:610
 #, fuzzy, c-format
 msgid "Error saving file: %s"
 msgstr ""
 "Feil ved lesing a fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:499
+#: composer/e-msg-composer.c:630
 #, fuzzy, c-format
 msgid "Error loading file: %s"
 msgstr ""
 "Feil ved nedlasting av fil:\n"
 "%1"
 
-#: composer/e-msg-composer.c:521
+#: composer/e-msg-composer.c:652
 #, fuzzy
 msgid "Saving changes to message..."
 msgstr "Lagrar alle endra filer ..."
 
-#: composer/e-msg-composer.c:523
+#: composer/e-msg-composer.c:654
 #, fuzzy
-msgid "About to save changes to message..."
-msgstr "I ferd med ц╔ senda e-post ..."
+msgid "Save changes to message..."
+msgstr "Lagrar alle endra filer ..."
+
+#: composer/e-msg-composer.c:695
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
 
-#: composer/e-msg-composer.c:608 shell/e-shell-view-menu.c:166
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 #, fuzzy
 msgid "Evolution"
 msgstr "Opplц╦ysing"
 
-#: composer/e-msg-composer.c:614
+#: composer/e-msg-composer.c:745
 #, fuzzy
 msgid ""
 "This message has not been sent.\n"
@@ -3273,230 +3770,116 @@ msgstr ""
 "Dette er siste trekk.\n"
 "Vil du leggja til fleire trekk?"
 
-#: composer/e-msg-composer.c:636
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Opna fil"
 
-#: composer/e-msg-composer.c:755
+#: composer/e-msg-composer.c:893
 #, fuzzy
 msgid "That file does not exist."
 msgstr "Fila finst ikkje\n"
 
-#: composer/e-msg-composer.c:765
+#: composer/e-msg-composer.c:903
 #, fuzzy
 msgid "That is not a regular file."
 msgstr "er ei vanleg fil"
 
-#: composer/e-msg-composer.c:775
+#: composer/e-msg-composer.c:913
 #, fuzzy
 msgid "That file exists but is not readable."
 msgstr "%1 finst, men er inga vanleg fil"
 
-#: composer/e-msg-composer.c:785
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:807
+#: composer/e-msg-composer.c:945
 #, 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:828
+#: composer/e-msg-composer.c:966
 #, fuzzy
 msgid "An error occurred while reading the file."
 msgstr "Feil ved opning av fil."
 
-#: composer/e-msg-composer.c:924
-#, fuzzy
-msgid "_File"
-msgstr "Fil"
-
-#: composer/e-msg-composer.c:930
-#, fuzzy
-msgid "_Open..."
-msgstr "Opna ..."
-
-#: composer/e-msg-composer.c:931
-#, fuzzy
-msgid "Load a previously saved message"
-msgstr "Fц╦rre melding"
-
-#: composer/e-msg-composer.c:939
-#, fuzzy
-msgid "_Save..."
-msgstr "Lagra ..."
-
-#: composer/e-msg-composer.c:940
-#, fuzzy
-msgid "Save message"
-msgstr "Lagra melding"
-
-#: composer/e-msg-composer.c:948
-#, fuzzy
-msgid "Save _as..."
-msgstr "Lagra som ..."
-
-#: composer/e-msg-composer.c:949
-#, fuzzy
-msgid "Save message with a different name"
-msgstr "Sender ei melding til ein nettverksspelar"
-
-#: composer/e-msg-composer.c:957
-#, fuzzy
-msgid "Save in _folder..."
-msgstr "Lagrar fil ..."
-
-#: composer/e-msg-composer.c:958
-#, fuzzy
-msgid "Save the message in a specified folder"
-msgstr "Lagra side til ascii-fil"
-
-#: composer/e-msg-composer.c:967
-#, fuzzy
-msgid "_Insert text file... (FIXME)"
-msgstr "Sett inn fil ..."
-
-#: composer/e-msg-composer.c:968
-#, fuzzy
-msgid "Insert a file as text into the message"
-msgstr "Oppgi eit nytt namn pц╔ meldinga."
-
-#: composer/e-msg-composer.c:977
-#, fuzzy
-msgid "Send _Now"
-msgstr "Send &no"
-
-#: composer/e-msg-composer.c:978
-#, fuzzy
-msgid "Send the message now"
-msgstr "Sen melding"
-
-#: composer/e-msg-composer.c:986
-#, fuzzy
-msgid "Send _Later"
-msgstr "Send &seinare"
-
-#: composer/e-msg-composer.c:987
-#, fuzzy
-msgid "Send the message later"
-msgstr "Sen melding"
-
-#: composer/e-msg-composer.c:997
-#, fuzzy
-msgid "_Close..."
-msgstr "Fargar ..."
-
-#: composer/e-msg-composer.c:998
-#, fuzzy
-msgid "Quit the message composer"
-msgstr "Comment=E-postredigering"
-
-#: composer/e-msg-composer.c:1011
-#, fuzzy
-msgid "_Edit"
-msgstr "Rediger"
-
-#: composer/e-msg-composer.c:1028
-msgid "HTML"
-msgstr "HTML"
-
-#: composer/e-msg-composer.c:1029
-msgid "Send the mail in HTML format"
-msgstr ""
-
-#: composer/e-msg-composer.c:1042 shell/e-storage-set-view.c:221
-#, fuzzy
-msgid "_View"
-msgstr "Vis"
-
-#: composer/e-msg-composer.c:1048
-#, fuzzy
-msgid "Show _attachments"
-msgstr "Vedlegg"
-
-#: composer/e-msg-composer.c:1049
-#, fuzzy
-msgid "Show/hide attachments"
-msgstr "Vedlegg som ikon"
-
-#: composer/e-msg-composer.c:1082
-msgid "Send"
-msgstr "Send"
-
-#: composer/e-msg-composer.c:1083
-#, fuzzy
-msgid "Send this message"
-msgstr "Sen melding"
-
-#: composer/e-msg-composer.c:1092
-#, fuzzy
-msgid "Attach"
-msgstr "&Legg ved"
-
-#: composer/e-msg-composer.c:1093
-#, fuzzy
-msgid "Attach a file"
-msgstr "Legg ved fil"
-
-#: composer/e-msg-composer.c:1317
+#: composer/e-msg-composer.c:1343
 #, fuzzy
 msgid "Compose a message"
 msgstr "Lukk melding"
 
-#: composer/e-msg-composer.c:1394
+#: composer/e-msg-composer.c:1420
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Kan ikkje laga nytt vindauge.\n"
 
-#: filter/filter-datespec.c:61
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "Kan ikkje initialisera lokale variablar"
+
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Sц╦k"
+
+#: filter/filter-datespec.c:62
 #, fuzzy
 msgid "years"
 msgstr "ц╔r"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 #, fuzzy
 msgid "months"
 msgstr "mц╔nad(er)"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 #, fuzzy
 msgid "weeks"
 msgstr "Veke"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 #, fuzzy
 msgid "days"
 msgstr " dag"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 #, fuzzy
 msgid "hours"
 msgstr "time/timar"
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minutt"
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3504,114 +3887,377 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 #, fuzzy
 msgid "the current time"
 msgstr "tid no"
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 #, fuzzy
 msgid "a time relative to the current time"
 msgstr "Vis hendingane for denne dagen"
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 #, fuzzy
 msgid "Compare against"
 msgstr "Kompilatorц╔tvaringar"
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 #, fuzzy
 msgid "<click here to select a date>"
 msgstr "Trykk for ц╔ velja ein skrifttype"
 
-#: filter/filter-editor.c:158 filter/score-editor.c:127
-#: filter/vfolder-editor.c:153
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 #, fuzzy
-msgid "Add Rule"
-msgstr "Legg til fil"
+msgid "Add Filter Rule"
+msgstr "Filter-reglar"
 
-#: filter/filter-editor.c:199
+#: filter/filter-editor.c:233
 #, fuzzy
-msgid "Edit Rule"
+msgid "Edit Filter Rule"
+msgstr "Rediger filterreglar"
+
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#, fuzzy
+msgid "Edit Filters"
 msgstr "Rediger fil"
 
 #. and now for the action area
-#: filter/filter-filter.c:396
+#: filter/filter-filter.c:401
 #, fuzzy
 msgid "Then"
 msgstr "Tiaren"
 
-#: filter/filter-filter.c:409
+#: filter/filter-filter.c:414
 #, fuzzy
 msgid "Add action"
 msgstr "&Legg til handling"
 
-#: filter/filter-filter.c:415
+#: filter/filter-filter.c:420
 #, fuzzy
 msgid "Remove action"
 msgstr "Fjern ein kolonne"
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 #, fuzzy
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:253
+#: filter/filter-folder.c:289
 #, fuzzy
 msgid "<click here to select a folder>"
 msgstr "Trykk for ц╔ velja ein skrifttype"
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:184
+#, fuzzy, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Feil ved lesing av fil:\n"
+"%s"
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:504
+#: filter/filter-rule.c:520
 #, fuzzy
 msgid "Rule name: "
 msgstr "Filnamn:"
 
-#: filter/filter-rule.c:508
-msgid "untitled"
-msgstr "utan tittel"
+#: filter/filter-rule.c:524
+#, fuzzy
+msgid "Untitled"
+msgstr "Utan tittel"
 
-#: filter/filter-rule.c:519
+#: filter/filter-rule.c:540
 #, fuzzy
 msgid "If"
 msgstr "I"
 
-#: filter/filter-rule.c:536
+#: filter/filter-rule.c:557
 #, fuzzy
 msgid "Execute actions"
 msgstr "Kц╦yr autorun.sh"
 
-#: filter/filter-rule.c:540
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:547
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:561
+#: filter/filter-rule.c:577
 #, fuzzy
 msgid "Add criterion"
 msgstr "Legg til kriterium"
 
-#: filter/filter-rule.c:567
+#: filter/filter-rule.c:583
 #, fuzzy
 msgid "Remove criterion"
 msgstr "Fjern element"
 
-#: filter/score-editor.c:165
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
+msgid "Edit"
+msgstr "Rediger"
+
+#: po/tmp/filter.glade.h:10
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "Rediger filterreglar"
+
+#: po/tmp/filter.glade.h:11
+#, fuzzy
+msgid "Filter Rules"
+msgstr "Filter-reglar"
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "Oversikt"
+
+#: po/tmp/filter.glade.h:15
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "Mapper"
+
+#: po/tmp/filter.glade.h:16
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "Kjelder"
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Colour"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:4
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "Kopier til mappe"
+
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Date received"
+msgstr "Motta"
+
+#: filter/libfilter-i18n.h:6
+#, 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"
+
+#: filter/libfilter-i18n.h:12
+#, fuzzy
+msgid "Message was received"
+msgstr "Melding motteken"
+
+#: filter/libfilter-i18n.h:13
+#, fuzzy
+msgid "Message was sent"
+msgstr "Lag meldingar og slц╔ saman"
+
+#: filter/libfilter-i18n.h:14
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Flytt til mappe"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Recipients"
+msgstr "Nyleg brukte fargar"
+
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+#, fuzzy
+msgid "Sender"
+msgstr "Send"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Status:"
+
+#: filter/libfilter-i18n.h:20
+#, fuzzy
+msgid "Source"
+msgstr "Kjelder"
+
+#: filter/libfilter-i18n.h:21
+msgid "Specific header"
+msgstr ""
+
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "Status:"
+
+#: filter/libfilter-i18n.h:23
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:24
+msgid "Subject"
+msgstr "Emne"
+
+#: filter/libfilter-i18n.h:25
+#, fuzzy
+msgid "after"
+msgstr "Slutt etter"
+
+#: filter/libfilter-i18n.h:26
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "contains"
+msgstr "Handlingar"
+
+#: filter/libfilter-i18n.h:28
+msgid "does not contain"
+msgstr ""
+
+#: 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"
+
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "does not sound like"
+msgstr "Fann ikkje fil"
+
+#: filter/libfilter-i18n.h:32
+#, fuzzy
+msgid "does not start with"
+msgstr "Kunne ikkje starta %1."
+
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "exists"
+msgstr "Neste"
+
+#: filter/libfilter-i18n.h:35
+msgid "is greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+#, fuzzy
+msgid "is"
+msgstr "er"
+
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "on or after"
+msgstr "Slutt etter"
+
+#: filter/libfilter-i18n.h:40
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+#, fuzzy
+msgid "was after"
+msgstr "Slutt etter"
+
+#: filter/libfilter-i18n.h:44
+msgid "was before"
+msgstr ""
+
+#: filter/score-editor.c:127
+#, fuzzy
+msgid "Add Rule"
+msgstr "Legg til fil"
+
+#: filter/score-editor.c:166
 #, fuzzy
 msgid "Edit Score Rule"
 msgstr "Rediger filterreglar"
@@ -3620,51 +4266,184 @@ msgstr "Rediger filterreglar"
 msgid "Score"
 msgstr "Poengsum"
 
-#: filter/vfolder-editor.c:192
+#: filter/vfolder-editor.c:155
 #, fuzzy
-msgid "Edit VFolder Rule"
+msgid "Add VFolder Rule"
 msgstr "Rediger filterreglar"
 
-#: mail/component-factory.c:213
+#: filter/vfolder-editor.c:204
 #, fuzzy
-msgid "Cannot initialize Evolution's mail component."
-msgstr "Kan ikkje initialisera lokale variablar"
+msgid "Edit VFolder Rule"
+msgstr "Rediger filterreglar"
 
-#: mail/component-factory.c:219
+#: mail/component-factory.c:227
 #, fuzzy
-msgid "Cannot initialize Evolution's mail summary component."
+msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikkje initialisera lokale variablar"
 
-#: mail/folder-browser-factory.c:55
-#, fuzzy, c-format
-msgid "Run filter \"%s\""
-msgstr "Inga slik fil \"%s\"!"
+#: mail/component-factory.c:266
+msgid "Cannot register storage with shell"
+msgstr ""
 
-#: mail/folder-browser.c:408
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Lagra"
 
-#: mail/mail-autofilter.c:75
+#: mail/folder-browser.c:153
+msgid "Body or subject contains"
+msgstr ""
+
+#: mail/folder-browser.c:154
+msgid "Body contains"
+msgstr ""
+
+#: mail/folder-browser.c:155
+#, fuzzy
+msgid "Subject contains"
+msgstr "Emne"
+
+#: mail/folder-browser.c:156
+msgid "Body does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:157
+msgid "Subject does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:453
+#, fuzzy
+msgid "VFolder on Subject"
+msgstr "Ingen emne"
+
+#: mail/folder-browser.c:454
+#, fuzzy
+msgid "VFolder on Sender"
+msgstr "Mappenamn:"
+
+#: mail/folder-browser.c:455
+#, fuzzy
+msgid "VFolder on Recipients"
+msgstr "Mappa finst: "
+
+#: mail/folder-browser.c:457
+#, fuzzy
+msgid "Filter on Subject"
+msgstr "Ingen emne"
+
+#: mail/folder-browser.c:458
+#, fuzzy
+msgid "Filter on Sender"
+msgstr "Fil under:"
+
+#: mail/folder-browser.c:459
+#, fuzzy
+msgid "Filter on Recipients"
+msgstr "Skriv ut filer"
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#, fuzzy
+msgid "Filter on Mailing List"
+msgstr "Fil alt i liste"
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "Opna ..."
+
+#: mail/folder-browser.c:466
+#, 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
+msgid "Print"
+msgstr "Skriv ut"
+
+#: mail/folder-browser.c:469
+#, 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
+#, 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
+msgid "Forward"
+msgstr "Fram"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Fram"
+
+#: mail/folder-browser.c:474
+#, fuzzy
+msgid "Mark as Read"
+msgstr "Mar&ker som ulesen"
+
+#: mail/folder-browser.c:475
+#, fuzzy
+msgid "Mark as Unread"
+msgstr "Mar&ker som ulesen"
+
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Flytt til mappe"
+
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Flytt til mappe"
+
+#: mail/folder-browser.c:480
+#, 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
+msgid "Apply Filters"
+msgstr ""
+
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
+
+#: mail/mail-autofilter.c:71
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Postkasse: %1"
 
-#: mail/mail-autofilter.c:229
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Emne"
+
+#: mail/mail-autofilter.c:230
 #, fuzzy, c-format
 msgid "Mail from %s"
 msgstr "Melding frц╔ %s"
 
-#: mail/mail-autofilter.c:283 mail/mail-autofilter.c:332
-#, fuzzy
-msgid "Add Filter Rule"
-msgstr "Filter-reglar"
-
-#: mail/mail-autofilter.c:328
+#: mail/mail-autofilter.c:331
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "E-post&liste for sprц╔ket:"
 
-#: mail/mail-callbacks.c:72
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3672,121 +4451,201 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:112
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:126
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:242
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+msgid "You have no mail sources configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:213
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:222
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:246
 #, fuzzy
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr "Meldinga har ingen sendar"
 
-#: mail/mail-callbacks.c:504
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-callbacks.c:506
+#: mail/mail-callbacks.c:554
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "&Kopier bileteplassering"
 
-#: mail/mail-callbacks.c:608
+#: mail/mail-callbacks.c:665
 #, 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:707
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#, fuzzy
+msgid "Overwrite file?"
+msgstr "Overskriv filer"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#, 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
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Lagra melding"
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Lagra melding"
+
+#: mail/mail-callbacks.c:877
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Les filinformasjon"
 
-#: mail/mail-callbacks.c:754 mail/message-list.c:1562
+#: mail/mail-callbacks.c:922
 #, fuzzy
 msgid "Print Message"
 msgstr "Private meldingar"
 
-#: mail/mail-callbacks.c:801
+#: mail/mail-callbacks.c:969
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "Feil ved skriving av band-ID."
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr "Identitet"
+
+#: po/tmp/mail-config-druid.glade.h:7
+#, fuzzy
+msgid "Mail Configuration"
+msgstr "Oppsett"
+
+#: po/tmp/mail-config-druid.glade.h:8
+#, fuzzy
+msgid "Mail Source"
+msgstr "E-posttenar"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+#, fuzzy
+msgid "Mail Transport"
+msgstr "&E-post-transport"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 #, fuzzy
 msgid "Full name:"
 msgstr "Fullt namn"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "E-post-adresse:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 #, fuzzy
 msgid "Signature file:"
 msgstr "Signaturfil:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 #, fuzzy
 msgid "Signature File"
 msgstr "Signaturfil:"
 
-#: mail/mail-config-gui.c:897
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Tenar:"
 
-#: mail/mail-config-gui.c:903
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Brukarnamn:"
 
-#: mail/mail-config-gui.c:909
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Sti:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Autentisering:"
 
-#: mail/mail-config-gui.c:930
+#: mail/mail-config-gui.c:956
 #, fuzzy
 msgid "Detect supported types..."
 msgstr "Vel modemtype ..."
 
-#: mail/mail-config-gui.c:957
+#: 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"
 msgstr "Slett e-post frц╔ tenaren"
 
-#: mail/mail-config-gui.c:969
+#: mail/mail-config-gui.c:1003
 #, fuzzy
 msgid "Test Settings"
 msgstr "Skriftinnstillingar"
 
-#: mail/mail-config-gui.c:1101 mail/mail-config-gui.c:1149
+#: mail/mail-config-gui.c:1130
+#, fuzzy
+msgid "Mail source type:"
+msgstr "E-post-&transport:"
+
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3795,7 +4654,12 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1125
+#: mail/mail-config-gui.c:1154
+#, fuzzy
+msgid "News source type:"
+msgstr "&Ny type"
+
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3804,484 +4668,595 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1144
+#: mail/mail-config-gui.c:1178
 #, fuzzy
 msgid "Mail transport type:"
 msgstr "E-post-&transport:"
 
-#: mail/mail-config-gui.c:1199
+#: mail/mail-config-gui.c:1233
 #, fuzzy
 msgid "Add Identity"
 msgstr " Identitet"
 
-#: mail/mail-config-gui.c:1201
+#: mail/mail-config-gui.c:1235
 #, fuzzy
 msgid "Edit Identity"
 msgstr " Identitet"
 
-#: mail/mail-config-gui.c:1293
+#: mail/mail-config-gui.c:1333
 #, fuzzy
 msgid "Add Source"
 msgstr "Kjelde:"
 
-#: mail/mail-config-gui.c:1295
+#: mail/mail-config-gui.c:1335
 #, fuzzy
 msgid "Edit Source"
 msgstr "Endra teneste"
 
-#: mail/mail-config-gui.c:1390
+#: mail/mail-config-gui.c:1430
 #, fuzzy
 msgid "Add News Server"
 msgstr "Legg til tenar"
 
-#: mail/mail-config-gui.c:1392
+#: mail/mail-config-gui.c:1432
 #, fuzzy
 msgid "Edit News Server"
 msgstr "R&ediger tenarar"
 
-#: mail/mail-config-gui.c:2263
+#: mail/mail-config-gui.c:2253
+#, fuzzy, c-format
+msgid "Testing \"%s\""
+msgstr "Lagar"
+
+#: mail/mail-config-gui.c:2255
+#, fuzzy, c-format
+msgid "Test connection to \"%s\""
+msgstr "Sambandet er brote."
+
+#: mail/mail-config-gui.c:2296
 #, fuzzy
 msgid "The connection was successful!"
 msgstr "Sambandet er brote."
 
-#: mail/mail-config-gui.c:2313
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2315
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 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.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-#, fuzzy
-msgid "Mail Configuration"
-msgstr "Oppsett"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Identitet"
-
-#: mail/mail-config-druid.glade.h:14
-#, fuzzy
-msgid "Mail Source"
-msgstr "E-posttenar"
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-#, fuzzy
-msgid "Mail Transport"
-msgstr "&E-post-transport"
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-msgstr ""
+#: po/tmp/mail-config.glade.h:7
+msgid "Address"
+msgstr "Adresse"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
+#: po/tmp/mail-config.glade.h:10
 #, fuzzy
 msgid "Identities"
 msgstr "Identifikator"
 
-#: mail/mail-config.glade.h:9
+#: po/tmp/mail-config.glade.h:11
 #, fuzzy
-msgid "Organization"
-msgstr "Organisasjon:"
-
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
-msgid "Edit"
-msgstr "Rediger"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
+msgid "Mail Sources"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:13
 #, fuzzy
-msgid "Mail Sources"
-msgstr "Kjelder"
+msgid "Mark message as seen [ms]: "
+msgstr "Lag meldingar og slц╔ saman"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/mail-config.glade.h:14
 #, fuzzy
 msgid "News Servers"
 msgstr "Diskusjonsgruppetenarar"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 #, fuzzy
 msgid "News Sources"
 msgstr "Kjelder"
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+#, fuzzy
+msgid "Organization"
+msgstr "Organisasjon:"
+
+#: po/tmp/mail-config.glade.h:18
 #, fuzzy
 msgid "Send messages in HTML format"
 msgstr "Send meldingar:"
 
-#: mail/mail-config.glade.h:27
-#, fuzzy
-msgid "Mark message as seen [ms]: "
-msgstr "Lag meldingar og slц╔ saman"
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Kjelder"
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 #, fuzzy
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Oppgi ditt OpenPGP-passord"
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 #, fuzzy
 msgid "No password provided."
 msgstr "Ingen passord oppgitt."
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, fuzzy, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunne ikkje laga katalog\n"
 
-#: mail/mail-crypto.c:600
+#: mail/mail-crypto.c:625
 #, fuzzy
 msgid "No GPG/PGP program available."
 msgstr "Ingen bilete tilgjengeleg."
 
-#: mail/mail-display.c:68
-#, fuzzy
-msgid "Overwrite file?"
-msgstr "Overskriv filer"
+#: mail/mail-display.c:90
+#, fuzzy, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
+"Kan ikkje fjerna post frц╔\n"
+"postboksen '%1':\n"
+"%2"
+
+#: mail/mail-display.c:113
+#, fuzzy, c-format
+msgid "Could not write data: %s"
+msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-display.c:72
+#: mail/mail-display.c:218
 #, 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?"
+msgid "Save Attachment"
+msgstr "Smarte vedlegg"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:258
+#, fuzzy, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+"Kunne ikkje laga mellombels fil\n"
+"%1:\n"
+"%2"
+
+#: mail/mail-display.c:300
 #, fuzzy
 msgid "Save to Disk..."
 msgstr "Lagra til disk"
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:302
 #, fuzzy, c-format
 msgid "Open in %s..."
 msgstr "Opnar URL ..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:304
 #, fuzzy
 msgid "View Inline"
 msgstr "Vinkel"
 
-#: mail/mail-display.c:299
+#: mail/mail-display.c:328
 #, fuzzy
 msgid "External Viewer"
 msgstr "Hendingsvisar"
 
-#: mail/mail-display.c:322
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:326
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Skjul"
 
-#: mail/mail-local.c:257
+#: mail/mail-format.c:500
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "Vedlegg"
+
+#: mail/mail-format.c:623
+#, fuzzy
+msgid "Reply-To:"
+msgstr "Svar"
+
+#: mail/mail-format.c:845
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+#, fuzzy
+msgid "Encrypted message not displayed"
+msgstr "Endra tidsvising"
+
+#: mail/mail-format.c:863
+#, fuzzy
+msgid "Encrypted message"
+msgstr "Lagra melding"
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1486
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
+#: mail/mail-local.c:261
+msgid "Closing current folder"
+msgstr ""
+
+#: mail/mail-local.c:293
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:314
+#, fuzzy
+msgid "Creating new folder"
+msgstr "Lagar ei ny mappe"
+
+#: mail/mail-local.c:329
+#, fuzzy
+msgid "Copying messages"
+msgstr "Melding"
+
+#: mail/mail-local.c:341
+#, 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
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
+#: mail/mail-local.c:781
+msgid "Registering local folder"
+msgstr ""
+
+#: mail/mail-local.c:783
+msgid "Register local folder"
 msgstr ""
 
-#: mail/mail-ops.c:68
+#: mail/mail-ops.c:79
 #, fuzzy, c-format
 msgid "Fetching email from %s"
 msgstr "Hentar data frц╔ %1"
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:81
 #, fuzzy, c-format
 msgid "Fetch email from %s"
 msgstr "Slett e-post frц╔ tenaren"
 
-#: mail/mail-ops.c:258
+#: mail/mail-ops.c:331
 #, fuzzy, c-format
 msgid "There is no new mail at %s."
 msgstr "Det er ikkje band i stasjonen."
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:401
 #, fuzzy
 msgid "Filtering email on demand"
 msgstr "Ring ved fц╦respurnad"
 
-#: mail/mail-ops.c:314
+#: mail/mail-ops.c:403
 #, fuzzy
 msgid "Filter email on demand"
 msgstr "Ring ved fц╦respurnad"
 
-#: mail/mail-ops.c:481
+#: mail/mail-ops.c:538
 #, fuzzy, c-format
 msgid "Sending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:486
+#: mail/mail-ops.c:543
 #, fuzzy
 msgid "Sending a message without a subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-ops.c:489
+#: mail/mail-ops.c:546
 #, fuzzy, c-format
 msgid "Send \"%s\""
 msgstr "Lagra: %s"
 
-#: mail/mail-ops.c:492
+#: mail/mail-ops.c:549
 #, fuzzy
 msgid "Send a message without a subject"
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: mail/mail-ops.c:636
+#: mail/mail-ops.c:720
 #, fuzzy
 msgid "Sending queue"
 msgstr "&Send meldingane i kц╦en"
 
-#: mail/mail-ops.c:638
+#: mail/mail-ops.c:722
 #, fuzzy
 msgid "Send queue"
 msgstr "&Send meldingane i kц╦en"
 
-#: mail/mail-ops.c:774 mail/mail-ops.c:781
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, fuzzy, c-format
 msgid "Appending \"%s\""
 msgstr "Sender %1"
 
-#: mail/mail-ops.c:778 mail/mail-ops.c:784
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 #, fuzzy
 msgid "Appending a message without a subject"
 msgstr "Sender meldingar til %1"
 
-#: mail/mail-ops.c:856
+#: mail/mail-ops.c:940
 #, fuzzy, c-format
 msgid "Expunging \"%s\""
 msgstr "Forventar %1"
 
-#: mail/mail-ops.c:858
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:917
+#: mail/mail-ops.c:1001
 #, fuzzy, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:919
+#: mail/mail-ops.c:1003
 #, fuzzy, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:922
+#: mail/mail-ops.c:1006
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Flytta alle meldingar til papirkorga"
 
-#: mail/mail-ops.c:924
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:954
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Flyttar"
 
-#: mail/mail-ops.c:957
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopierer"
 
-#: mail/mail-ops.c:969
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1046
+#: mail/mail-ops.c:1141
 #, fuzzy, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:1049
+#: mail/mail-ops.c:1144
 #, fuzzy, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Lag meldingar og slц╔ saman"
 
-#: mail/mail-ops.c:1192
+#: mail/mail-ops.c:1175
+#, fuzzy, c-format
+msgid "Marking message %d of %d"
+msgstr "Markerer meldingar"
+
+#: mail/mail-ops.c:1295
 #, fuzzy, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar etter tilleggsmodular"
 
-#: mail/mail-ops.c:1195
+#: mail/mail-ops.c:1297
 #, fuzzy, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Lag ny mappe i %1"
 
-#: mail/mail-ops.c:1264
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 #, fuzzy
 msgid "(No description)"
 msgstr "Inga skildring"
 
-#: mail/mail-ops.c:1324
+#: mail/mail-ops.c:1432
 #, fuzzy, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:1327
+#: mail/mail-ops.c:1435
 #, fuzzy, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Melding frц╔ %s"
 
-#: mail/mail-ops.c:1430
+#: mail/mail-ops.c:1535
 #, fuzzy, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1539
 #, fuzzy
 msgid "Forwarding a message without a subject"
 msgstr "advarsel: denne meldinga er ikkje brukt"
 
-#: mail/mail-ops.c:1438
+#: mail/mail-ops.c:1542
 #, fuzzy, c-format
 msgid "Forward message \"%s\""
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1443
+#: mail/mail-ops.c:1546
 #, fuzzy
 msgid "Forward a message without a subject"
 msgstr "Vidaresendt melding frц╔ %1"
 
-#: mail/mail-ops.c:1472
+#: 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:1485
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1571
+#: mail/mail-ops.c:1665
+#, 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
 #, fuzzy, c-format
 msgid "Loading \"%s\""
 msgstr "Lastar meldingar"
 
-#: mail/mail-ops.c:1573
+#: mail/mail-ops.c:1750
 #, fuzzy, c-format
 msgid "Load \"%s\""
 msgstr "Last inn"
 
-#: mail/mail-ops.c:1675
+#: mail/mail-ops.c:1853
 #, fuzzy, c-format
 msgid "Creating \"%s\""
 msgstr "Lagar"
 
-#: mail/mail-ops.c:1677
+#: mail/mail-ops.c:1855
 #, fuzzy, c-format
 msgid "Create \"%s\""
 msgstr "Laga"
 
-#: mail/mail-ops.c:1723
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1769
+#: mail/mail-ops.c:1949
 #, fuzzy, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniser"
 
-#: mail/mail-ops.c:1771
+#: mail/mail-ops.c:1951
 #, fuzzy, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkroniser"
 
-#: mail/mail-ops.c:1834
+#: mail/mail-ops.c:2015
 #, fuzzy, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Vis meldingstorleik"
 
-#: mail/mail-ops.c:1837
+#: mail/mail-ops.c:2018
 #, fuzzy
 msgid "Clearing message display"
 msgstr "Markerer meldingar"
 
-#: mail/mail-ops.c:1840
+#: mail/mail-ops.c:2021
 #, fuzzy, c-format
 msgid "Display message UID \"%s\""
 msgstr "Vis meldingstorleik"
 
-#: mail/mail-ops.c:1843
+#: mail/mail-ops.c:2024
 #, fuzzy
 msgid "Clear message display"
 msgstr "Endra tidsvising"
 
-#: mail/mail-ops.c:1952
+#: mail/mail-ops.c:2137
 #, fuzzy, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:1955
+#: mail/mail-ops.c:2140
 #, fuzzy, c-format
 msgid "Open messages from \"%s\""
 msgstr "Melding frц╔ %s"
 
-#: mail/mail-ops.c:2059
+#: mail/mail-ops.c:2244
 #, fuzzy, c-format
 msgid "Loading %s Folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:2061
+#: mail/mail-ops.c:2246
 #, fuzzy, c-format
 msgid "Load %s Folder"
 msgstr "Endra mappe"
 
-#: mail/mail-ops.c:2126
+#: mail/mail-ops.c:2310
 #, fuzzy, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-ops.c:2129
+#: mail/mail-ops.c:2313
 #, fuzzy, c-format
 msgid "View messages from \"%s\""
 msgstr "Melding frц╔ %s"
 
-#: mail/mail-ops.c:2155
+#: mail/mail-ops.c:2339
 #, fuzzy, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/mail-threads.c:274
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Mottek meldingar frц╔ %1"
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Mottek meldingar frц╔ %1"
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Mottek meldingar frц╔ %1"
+
+#: mail/mail-search-dialogue.c:104
+#, fuzzy
+msgid "Cancel"
+msgstr "Avbroten."
+
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#, fuzzy
+msgid "Incomplete message written on pipe!"
+msgstr "<ferdig melding>"
+
+#: mail/mail-threads.c:301
 #, fuzzy, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4290,7 +5265,7 @@ msgstr ""
 "Feil ved lesing av fil:\n"
 "%s"
 
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:675
 #, fuzzy, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4299,32 +5274,27 @@ msgstr ""
 "Feil ved laging av fil '%1':\n"
 "%2"
 
-#: mail/mail-threads.c:676
-#, fuzzy
-msgid "Incomplete message written on pipe!"
-msgstr "<ferdig melding>"
-
-#: mail/mail-threads.c:680
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:745
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:856
+#: mail/mail-threads.c:916
 #, fuzzy
 msgid "Could not create dialog box."
 msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: mail/mail-threads.c:865
+#: mail/mail-threads.c:927
 #, fuzzy
 msgid "User cancelled query."
 msgstr ""
 "Brukaren avbraut handling\n"
 "%1"
 
-#: mail/mail-tools.c:206
+#: mail/mail-tools.c:189
 #, fuzzy, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
@@ -4332,42 +5302,55 @@ msgstr ""
 "%1:\n"
 "%2"
 
-#: mail/mail-tools.c:294
+#. Get all uids of source
+#: mail/mail-tools.c:239
+#, fuzzy, c-format
+msgid "Examining %s"
+msgstr "Forventar %1"
+
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
-#: mail/mail-tools.c:387
-#, c-format
-msgid "[%s] %s"
-msgstr ""
+#. Info
+#: mail/mail-tools.c:290
+#, fuzzy, c-format
+msgid "Retrieving message %d of %d"
+msgstr "Mottek meldingar frц╔ %1"
+
+#. Append it to dest
+#: mail/mail-tools.c:303
+#, fuzzy, c-format
+msgid "Writing message %d of %d"
+msgstr "Mottek meldingar frц╔ %1"
+
+#: mail/mail-tools.c:332
+#, fuzzy, c-format
+msgid "Saving changes to %s"
+msgstr "Lagrar alle endra filer ..."
 
-#: mail/mail-tools.c:389
+#: mail/mail-tools.c:369
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-tools.c:398
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (ingen emne)"
 
-#: mail/mail-tools.c:435
+#: mail/mail-tools.c:418
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Vidaresendt melding frц╔ %1"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:420
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "Vidaresendt melding frц╔ %1"
 
-#: mail/mail-tools.c:549
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr ""
-
-#: mail/mail-tools.c:578
+#: mail/mail-tools.c:523
 #, fuzzy, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4377,172 +5360,158 @@ msgstr ""
 "postboksen '%1':\n"
 "%2"
 
-#: mail/mail-vfolder.c:302
+#: mail/mail-vfolder.c:147
+#, fuzzy
+msgid "VFolders"
+msgstr "Mapper"
+
+#: mail/mail-vfolder.c:296
 #, 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:151
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/mail-view.c:151
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 #, fuzzy
 msgid "Reply to the sender of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:154 mail/message-list.c:1565
-#, fuzzy
-msgid "Reply to All"
-msgstr "Svar til alle:"
-
-#: mail/mail-view.c:154
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 #, fuzzy
 msgid "Reply to all recipients of this message"
 msgstr "Fann ikkje sendaren av denne meldinga"
 
-#: mail/mail-view.c:157
-msgid "Forward"
-msgstr "Fram"
-
-#: mail/mail-view.c:157
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 #, fuzzy
 msgid "Forward this message"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-view.c:161
-msgid "Print"
-msgstr "Skriv ut"
-
-#: mail/mail-view.c:161
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 #, fuzzy
 msgid "Print the selected message"
 msgstr "Sentrer dei valte elementa"
 
-#: mail/mail-view.c:163
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 #, fuzzy
 msgid "Delete this message"
 msgstr "Slett denne adressa"
 
-#: mail/message-list.c:889
-msgid "From"
-msgstr "Frц╔"
-
-#: mail/message-list.c:896
-msgid "Subject"
-msgstr "Emne"
-
-#: mail/message-list.c:903
-msgid "Date"
-msgstr "Dato"
-
-#: mail/message-list.c:910
+#: mail/message-list.c:572
 #, fuzzy
-msgid "Received"
-msgstr "Motta"
+msgid "Unseen"
+msgstr "partalssider"
 
-#: mail/message-list.c:917
-msgid "To"
-msgstr "Til"
+#: mail/message-list.c:575
+#, fuzzy
+msgid "Seen"
+msgstr "Send"
 
-#: mail/message-list.c:924
-msgid "Size"
-msgstr "Storleik"
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr ""
 
-#: mail/message-list.c:1560
-#, fuzzy
-msgid "Open in New Window"
-msgstr "&Opna i eige vindauge"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
+msgstr ""
 
-#: mail/message-list.c:1561
-#, fuzzy
-msgid "Edit Message"
-msgstr "Legg til melding"
+#. 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
 
-#: mail/message-list.c:1564
+#: mail/message-list.c:860 mail/message-list.c:875
 #, fuzzy
-msgid "Reply to Sender"
-msgstr "Svar til avsendar:"
+msgid "<unknown>"
+msgstr "Ukjend"
 
-#: mail/message-list.c:1566
+#: mail/message-list.c:2068
 #, fuzzy
-msgid "Forward Message"
-msgstr "Vidaresendt melding"
+msgid "Rebuilding message view"
+msgstr "Feil ved skriving av band-ID."
 
-#: mail/message-list.c:1568
+#: mail/message-list.c:2070
 #, fuzzy
-msgid "Delete Message"
-msgstr "Neste melding"
+msgid "Rebuild message view"
+msgstr "Sen melding"
 
-#: mail/message-list.c:1569
-#, fuzzy
-msgid "Move Message"
-msgstr "Lagra melding"
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
+msgstr ""
 
-#: mail/message-list.c:1570
-#, fuzzy
-msgid "Copy Message"
-msgstr "Melding"
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1572
-#, fuzzy
-msgid "VFolder on Subject"
-msgstr "Ingen emne"
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1573
-#, fuzzy
-msgid "VFolder on Sender"
-msgstr "Mappenamn:"
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Leitar etter tilleggsmodular"
 
-#: mail/message-list.c:1574
-#, fuzzy
-msgid "VFolder on Recipients"
-msgstr "Mappa finst: "
+#: mail/subscribe-dialog.c:286
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/message-list.c:1576
-#, fuzzy
-msgid "Filter on Subject"
-msgstr "Ingen emne"
+#: mail/subscribe-dialog.c:290
+#, fuzzy, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr "Lag ny mappe i %1"
 
-#: mail/message-list.c:1577
-#, fuzzy
-msgid "Filter on Sender"
-msgstr "Fil under:"
+#: mail/subscribe-dialog.c:293
+#, fuzzy, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr "Mottek meldingar frц╔ %1"
 
-#: mail/message-list.c:1578
+#: shell/e-setup.c:112 shell/e-setup.c:183
 #, fuzzy
-msgid "Filter on Recipients"
-msgstr "Skriv ut filer"
+msgid "Evolution installation"
+msgstr "KDeelop-installering"
 
-#: mail/message-list.c:1579 mail/message-list.c:1602
-#, fuzzy
-msgid "Filter on Mailing List"
-msgstr "Fil alt i liste"
+#: shell/e-setup.c:116
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
+msgstr ""
 
-#: mail/message-list.c:1604
-#, c-format
-msgid "Filter on Mailing List (%s)"
+#: shell/e-setup.c:117
+msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:47
+#: shell/e-setup.c:155
 #, fuzzy
-msgid "Evolution installation"
-msgstr "KDeelop-installering"
+msgid "Could not update files correctly"
+msgstr "Kunne ikkje laga kio-jobb.\n"
 
-#: shell/e-setup.c:51
+#: shell/e-setup.c:158 shell/e-setup.c:224
+#, fuzzy
+msgid "Evolution files successfully installed."
+msgstr "Alle filer vart sletta."
+
+#: shell/e-setup.c:187
 #, 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:52
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:69
+#: shell/e-setup.c:205
 #, fuzzy, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4552,19 +5521,14 @@ msgstr ""
 "Kan ikkje laga heimekatalog\n"
 "Feil: %1"
 
-#: shell/e-setup.c:84
+#: shell/e-setup.c:220
 #, fuzzy, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr "kan ikkje opna fila %1"
 
-#: shell/e-setup.c:88
-#, fuzzy
-msgid "Evolution files successfully installed."
-msgstr "Alle filer vart sletta."
-
-#: shell/e-setup.c:109
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4572,7 +5536,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:121
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4605,11 +5569,11 @@ msgid ""
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:274
+#: shell/e-shell-folder-selection-dialog.c:291
 msgid "New..."
 msgstr "Ny ..."
 
-#: shell/e-shell-folder-title-bar.c:448 shell/e-shell-folder-title-bar.c:449
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Utan tittel"
@@ -4627,48 +5591,48 @@ msgstr ""
 msgid "Bug buddy could not be run."
 msgstr "Kunne ikkje lagra adresseboka."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:172
 #, fuzzy
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Opphavsrett (c), %1 1997-2000"
 
-#: shell/e-shell-view-menu.c:170
+#: shell/e-shell-view-menu.c:174
 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:325
+#: shell/e-shell-view-menu.c:335
 #, fuzzy
 msgid "Go to folder..."
 msgstr "Flytt til mappe"
 
-#: shell/e-shell-view.c:134
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:413
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Mapper"
 
-#: shell/e-shell-view.c:996
+#: shell/e-shell-view.c:1077
 #, fuzzy, c-format
 msgid "Evolution - %s"
 msgstr "Evalueringsfeil"
 
-#: shell/e-shell-view.c:1136
+#: shell/e-shell.c:372
+#, fuzzy, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Kan ikkje setja blokkstorleik for band."
+
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell.c:331
-#, fuzzy, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Kan ikkje setja blokkstorleik for band."
-
 #: shell/e-shortcuts-view.c:122
 #, fuzzy
 msgid "Create new shortcut group"
@@ -4746,75 +5710,78 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr "Feil ved lagring av innstillingar."
 
-#: shell/e-storage.c:127
+#: 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
+#, fuzzy
+msgid "_View"
+msgstr "Vis"
+
+#: shell/e-storage-set-view.c:235
+#, fuzzy
+msgid "View the selected folder"
+msgstr "Slettar den valte fila"
+
+#: shell/e-storage.c:138
 #, fuzzy
 msgid "(No name)"
 msgstr "Ingen namn"
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:389
 #, fuzzy
 msgid "No error"
 msgstr "Ingen feil."
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:391
 #, fuzzy
 msgid "Generic error"
 msgstr "Generell feil"
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:393
 #, fuzzy
 msgid "A folder with the same name already exists"
 msgstr "Ein tabell med det namnet finst alt."
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:395
 #, fuzzy
 msgid "The specified folder type is not valid"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:397
 #, fuzzy
 msgid "I/O error"
 msgstr "IU-feil"
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:399
 #, fuzzy
 msgid "Not enough space to create the folder"
 msgstr "Ikkje nok skip ц╔ senda."
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:401
 #, fuzzy
 msgid "The specified folder was not found"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:403
 #, fuzzy
 msgid "Function not implemented in this storage"
 msgstr "Kommando ikkje stц╦tta pц╔ tenar"
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Nekta tilgang"
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:407
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Operasjonen vart stoppa"
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:409
 #, fuzzy
 msgid "The specified type is not supported in this storage"
 msgstr "Den oppgitte fila finst ikkje"
 
-#: shell/e-storage.c:340
-msgid "Unknown error"
-msgstr "Ukjend feil"
-
-#: shell/e-storage-set-view.c:221
-#, fuzzy
-msgid "View the selected folder"
-msgstr "Slettar den valte fila"
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -4836,22 +5803,1292 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:123
+#: shell/main.c:132
 #, fuzzy
 msgid "Cannot initialize the Evolution shell."
 msgstr "Kan ikkje initialisera adresseboka"
 
-#: shell/main.c:160
+#: shell/main.c:178
+#, fuzzy
+msgid "Disable."
+msgstr "Deaktivert"
+
+#: shell/main.c:198
 #, fuzzy
 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
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Lagar eit nytt dokument"
+
+#: po/tmp/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
+#, fuzzy
+msgid "Find"
+msgstr "Finn ..."
+
+#: po/tmp/evolution-addressbook.xml.h:11
+msgid "Find a contact"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
+#, fuzzy
+msgid "New"
+msgstr "Ny ..."
+
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "Stop Loading"
+msgstr "Lagring"
+
+#: po/tmp/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "View All"
+msgstr "Vinkel"
+
+#: po/tmp/evolution-addressbook.xml.h:18
+msgid "View all contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "&Innhald ..."
+
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+#, fuzzy
+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
+#, fuzzy
+msgid "5 Days"
+msgstr " dag"
+
+#: po/tmp/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Alter preferences"
+msgstr "Innstillingar"
+
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Skriv ut alle"
+
+#: po/tmp/evolution-calendar.xml.h:9
+#, fuzzy
+msgid "Calendar Preferences..."
+msgstr "Innstillingar"
+
+#: po/tmp/evolution-calendar.xml.h:10
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "&Slett avtale"
+
+#: po/tmp/evolution-calendar.xml.h:11
+#, fuzzy
+msgid "Create a new calendar"
+msgstr "Feil ved opning"
+
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr "Dag"
+
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:15
+#, fuzzy
+msgid "Go to"
+msgstr "Gц╔ til side"
+
+#: po/tmp/evolution-calendar.xml.h:16
+#, fuzzy
+msgid "Go to a specific date"
+msgstr "Gц╔ til side"
+
+#: po/tmp/evolution-calendar.xml.h:17
+#, fuzzy
+msgid "Go to present time"
+msgstr "Ikkje vis den overskytande teksten"
+
+#: po/tmp/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
+#, fuzzy
+msgid "Next"
+msgstr "Neste"
+
+#: po/tmp/evolution-calendar.xml.h:21
+#, fuzzy
+msgid "Open a calendar"
+msgstr "Feil ved opning"
+
+#: po/tmp/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Prev"
+msgstr "Fц╦rehandsvising:"
+
+#: po/tmp/evolution-calendar.xml.h:24
+#, fuzzy
+msgid "Print this calendar"
+msgstr "Skriv ut alle"
+
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:26
+#, fuzzy
+msgid "Show 1 day"
+msgstr "Vis dato"
+
+#: po/tmp/evolution-calendar.xml.h:27
+#, fuzzy
+msgid "Show 1 month"
+msgstr "Vis metodar"
+
+#: po/tmp/evolution-calendar.xml.h:28
+#, fuzzy
+msgid "Show 1 week"
+msgstr "Vis %1"
+
+#: po/tmp/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
+#, fuzzy
+msgid "Today"
+msgstr "i dag"
+
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Veke"
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#, fuzzy
+msgid "_New"
+msgstr "Vis"
+
+#: po/tmp/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "Feil ved opning"
+
+#: po/tmp/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "_Print this calendar"
+msgstr "Skriv ut alle"
+
+#: po/tmp/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save Calendar As"
+msgstr "Ny kalender"
+
+#: po/tmp/evolution-contact-editor.xml.h:7
+#, fuzzy
+msgid "Delete this item"
+msgstr "Slett denne adressa"
+
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "Slett"
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+msgid "Help"
+msgstr ""
+
+#: po/tmp/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
+#, 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
+#, 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
+#, fuzzy
+msgid "Save _As..."
+msgstr "Lagra som ..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+#, fuzzy
+msgid "Save and Close"
+msgstr "Lagra ei fil"
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "See online help"
+msgstr "Me er tilkopla!"
+
+#: po/tmp/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
+#, fuzzy
+msgid "_File"
+msgstr "Fil"
+
+#: po/tmp/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
+#, fuzzy
+msgid "_Save"
+msgstr "Lagra"
+
+#.
+#. * 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
+msgid "About this application"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "About..."
+msgstr "Skrifttype ..."
+
+#: po/tmp/evolution-event-editor.xml.h:8
+#, fuzzy
+msgid "Actio_ns"
+msgstr "Handlingar"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "Teikn"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "Klipp ut"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Clear"
+msgstr "Teikn"
+
+#: po/tmp/evolution-event-editor.xml.h:12
+#, fuzzy
+msgid "Clear the selection"
+msgstr "Slettar den valte fila"
+
+#: po/tmp/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
+msgid "Copy"
+msgstr "Kopier"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "Klipp ut"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:23
+#, fuzzy
+msgid "FIXME: Address _Book..."
+msgstr "Adresse&bok ..."
+
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: po/tmp/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
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:28
+#, fuzzy
+msgid "FIXME: Define Print _Styles"
+msgstr "&Fц╦rehandsvising ..."
+
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:31
+#, fuzzy
+msgid "FIXME: For_ward"
+msgstr "Fort framover"
+
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:33
+#, fuzzy
+msgid "FIXME: Help"
+msgstr "&KDE-hjelp"
+
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:35
+#, fuzzy
+msgid "FIXME: Insert File"
+msgstr "Sett inn fil ..."
+
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:37
+#, fuzzy
+msgid "FIXME: Paste _Special... "
+msgstr "Lim inn spesiell ..."
+
+#: po/tmp/evolution-event-editor.xml.h:38
+#, fuzzy
+msgid "FIXME: Print Pre_view"
+msgstr "&Fц╦rehandsvising ..."
+
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:41
+#, fuzzy
+msgid "FIXME: Rec_urrence..."
+msgstr "Repetering"
+
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:43
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "Smarte vedlegg"
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:47
+#, fuzzy
+msgid "FIXME: _Customize..."
+msgstr "Tilpass ..."
+
+#: po/tmp/evolution-event-editor.xml.h:48
+#, fuzzy
+msgid "FIXME: _File..."
+msgstr "Sett inn fil ..."
+
+#: po/tmp/evolution-event-editor.xml.h:49
+#, fuzzy
+msgid "FIXME: _Font..."
+msgstr "Skrifttype ..."
+
+#: po/tmp/evolution-event-editor.xml.h:50
+#, fuzzy
+msgid "FIXME: _Formatting"
+msgstr "Tekstformatering"
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:54
+msgid "FIXME: _Mail Message"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:55
+#, fuzzy
+msgid "FIXME: _Memo Style"
+msgstr "Elementstil"
+
+#: po/tmp/evolution-event-editor.xml.h:56
+#, fuzzy
+msgid "FIXME: _Move to Folder..."
+msgstr "Flytt til mappe"
+
+#: po/tmp/evolution-event-editor.xml.h:57
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "Se&nd avtale"
+
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:59
+#, fuzzy
+msgid "FIXME: _Object..."
+msgstr "&Objekt ..."
+
+#: po/tmp/evolution-event-editor.xml.h:60
+#, fuzzy
+msgid "FIXME: _Paragraph..."
+msgstr "&Avsnitt ..."
+
+#: po/tmp/evolution-event-editor.xml.h:61
+#, fuzzy
+msgid "FIXME: _Spelling..."
+msgstr "&Stavekontroll ..."
+
+#: po/tmp/evolution-event-editor.xml.h:62
+#, fuzzy
+msgid "FIXME: _Standard"
+msgstr "Standard"
+
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "F_ormat"
+msgstr "Format"
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "Go to the previous item"
+msgstr "Gц╔ til neste som treng ettersyn"
+
+#: po/tmp/evolution-event-editor.xml.h:72
+#, fuzzy
+msgid "Modify the file's properties"
+msgstr "Linjeeigenskapar"
+
+#: po/tmp/evolution-event-editor.xml.h:73
+#, fuzzy
+msgid "N_ext"
+msgstr "Neste"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "Lim inn"
+
+#: po/tmp/evolution-event-editor.xml.h:76
+#, fuzzy
+msgid "Paste the clipboard"
+msgstr "Limer inn ..."
+
+#: po/tmp/evolution-event-editor.xml.h:77
+#, fuzzy
+msgid "Pre_vious"
+msgstr "Fц╦rre"
+
+#: po/tmp/evolution-event-editor.xml.h:78
+#, fuzzy
+msgid "Previous"
+msgstr "Fц╦rre"
+
+#: po/tmp/evolution-event-editor.xml.h:79
+msgid "Print S_etup..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:80
+#, fuzzy
+msgid "Print Setup"
+msgstr "Speloppsett"
+
+#: po/tmp/evolution-event-editor.xml.h:83
+#, fuzzy
+msgid "Properties"
+msgstr "Eigenskapar ..."
+
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "Tilfeldig"
+
+#: po/tmp/evolution-event-editor.xml.h:85
+#, fuzzy
+msgid "Redo the undone action"
+msgstr "Fjern ein kolonne"
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "Svar"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "Save the current file"
+msgstr "tid no"
+
+#: po/tmp/evolution-event-editor.xml.h:93
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "Kц╦yreplan ..."
+
+#: po/tmp/evolution-event-editor.xml.h:94
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "Kц╦yreplan ..."
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:99
+#, fuzzy
+msgid "Select All"
+msgstr "Vel mappe"
+
+#: po/tmp/evolution-event-editor.xml.h:100
+#, fuzzy
+msgid "Select everything"
+msgstr "Vel mappe"
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "_About..."
+msgstr "Skrifttype ..."
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "Lukk"
+
+#: po/tmp/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
+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
+#, fuzzy
+msgid "_Edit"
+msgstr "Rediger"
+
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "Finn ..."
+
+#: po/tmp/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
+#, fuzzy
+msgid "_Help"
+msgstr "Heim"
+
+#: po/tmp/evolution-event-editor.xml.h:114
+#, fuzzy
+msgid "_Insert"
+msgstr "Set inn"
+
+#: po/tmp/evolution-event-editor.xml.h:115
+#, fuzzy
+msgid "_Object"
+msgstr "Objekt"
+
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "Lim inn"
+
+#: po/tmp/evolution-event-editor.xml.h:117
+#, fuzzy
+msgid "_Print"
+msgstr "Skriv ut"
+
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "Eigenskapar ..."
+
+#: po/tmp/evolution-event-editor.xml.h:119
+#, fuzzy
+msgid "_Redo"
+msgstr "Tilfeldig"
+
+#: po/tmp/evolution-event-editor.xml.h:120
+#, fuzzy
+msgid "_Replace..."
+msgstr "Opna ..."
+
+#: po/tmp/evolution-event-editor.xml.h:122
+#, fuzzy
+msgid "_Toolbars"
+msgstr "Verktц╦ylinjer"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Compose"
+msgstr "Lukk"
+
+#: po/tmp/evolution-mail.xml.h:7
+#, fuzzy
+msgid "Compose a new message"
+msgstr "Lukk melding"
+
+#: po/tmp/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
+#, fuzzy
+msgid "F_older"
+msgstr "Mapper"
+
+#: po/tmp/evolution-mail.xml.h:14
+#, fuzzy
+msgid "Fi_lter on Sender"
+msgstr "Fil under:"
+
+#: po/tmp/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Filter on Rec_ipients"
+msgstr "Skriv ut filer"
+
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Get Mail"
+msgstr "Detaljar"
+
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
+msgstr "E-post:"
+
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Skildring:"
+
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Mar_k As Read"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "Mar&ker som ulesen"
+
+#: po/tmp/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Move"
+msgstr "Mц╔n"
+
+#: po/tmp/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Move message to a new folder"
+msgstr "Lagra side til ascii-fil"
+
+#: po/tmp/evolution-mail.xml.h:27
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "Sen melding"
+
+#: po/tmp/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "&Fц╦rehandsvising ..."
+
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Print message..."
+msgstr "Private meldingar"
+
+#: po/tmp/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Svar til alle:"
+
+#: po/tmp/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Reply to _Sender"
+msgstr "Svar til avsendar:"
+
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#, fuzzy
+msgid "Select _All"
+msgstr "Vel mappe"
+
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:41
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Vidaresendt melding frц╔ %1"
+
+#: po/tmp/evolution-mail.xml.h:42
+#, fuzzy
+msgid "VFolder on Se_nder"
+msgstr "Mappenamn:"
+
+#: po/tmp/evolution-mail.xml.h:43
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "Mappa finst: "
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
+msgid "_Apply Filters"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:46
+msgid "_Configure Folder"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "Kopier til mappe"
+
+#: po/tmp/evolution-mail.xml.h:49
+#, fuzzy
+msgid "_Edit Message"
+msgstr "Legg til melding"
+
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:51
+#, fuzzy
+msgid "_Filter on Subject"
+msgstr "Ingen emne"
+
+#: po/tmp/evolution-mail.xml.h:52
+#, fuzzy
+msgid "_Forward"
+msgstr "Fram"
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "Oppsett"
+
+#: po/tmp/evolution-mail.xml.h:55
+#, fuzzy
+msgid "_Message"
+msgstr "Legg til melding"
+
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "Flytt til mappe"
+
+#: po/tmp/evolution-mail.xml.h:57
+#, fuzzy
+msgid "_Open in New Window"
+msgstr "&Opna i eige vindauge"
+
+#: po/tmp/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Print Message"
+msgstr "Private meldingar"
+
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Lagra melding"
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Kjelder"
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "Slett"
+
+#: po/tmp/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_VFolder on Subject"
+msgstr "Ingen emne"
+
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
+msgstr ""
+
+#.
+#. * 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
+#, fuzzy
+msgid "Attach"
+msgstr "&Legg ved"
+
+#: po/tmp/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "Close the current file"
+msgstr "tid no"
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr "HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:12
+#, 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
+#, fuzzy
+msgid "Insert text file..."
+msgstr "Sett inn fil ..."
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "Opna fil"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "Lagra"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "Lagrar fil ..."
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Lagrar fil ..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+#, 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
+#, fuzzy
+msgid "Save the message in a specified folder"
+msgstr "Lagra side til ascii-fil"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Send"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "Send &seinare"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "Send &seinare"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send the mail in HTML format"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Sen melding"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "Sen melding"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Sen melding"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Vedlegg som ikon"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show _attachments"
+msgstr "Vedlegg"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "Vedlegg"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+#, fuzzy
+msgid "_Insert text file... (FIXME)"
+msgstr "Sett inn fil ..."
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "Opna ..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:7
+#, fuzzy
+msgid "E_xit"
+msgstr "Avslutt"
+
+#: po/tmp/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution bar _shortcut"
+msgstr "Evalueringsfeil"
+
+#: po/tmp/evolution.xml.h:9
+msgid "Exit the program"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:10
+#, fuzzy
+msgid "Getting _Started"
+msgstr "Starta"
+
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:12
+msgid "Show the _Folder Bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:13
+msgid "Show the _Shortcut Bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:14
+msgid "Submit _Bug Report"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: po/tmp/evolution.xml.h:16
+msgid "Toggle whether to show the folder bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:17
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:18
+msgid "Using the C_ontact Manager"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:19
+#, fuzzy
+msgid "Using the _Calendar"
+msgstr "Skriv ut alle"
+
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:21
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Opplц╦ysing"
+
+#: po/tmp/evolution.xml.h:22
+#, fuzzy
+msgid "_Appointment (FIXME)"
+msgstr "Avtale"
+
+#: po/tmp/evolution.xml.h:23
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "Comment=X-redigering"
+
+#: po/tmp/evolution.xml.h:26
+#, fuzzy
+msgid "_Folder"
+msgstr "Mapper"
+
+#: po/tmp/evolution.xml.h:27
+#, fuzzy
+msgid "_Go to Folder..."
+msgstr "Flytt til mappe"
+
+#: po/tmp/evolution.xml.h:29
+#, fuzzy
+msgid "_Index"
+msgstr "Set inn"
+
+#: po/tmp/evolution.xml.h:30
+msgid "_Mail message (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:32
+#, fuzzy
+msgid "_Settings"
+msgstr "Skriftinnstillingar"
+
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr ""
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Mellombels"
@@ -4940,48 +7177,31 @@ msgstr ""
 msgid "All Attendees"
 msgstr "Kontaktar"
 
-#. 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.c:2468
-msgid "%A, %B %d, %Y"
-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:415
-msgid "MTWTFSS"
-msgstr ""
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2671
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 #, fuzzy
 msgid "%B %Y"
 msgstr "%1 %2"
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr " ..."
 
-#: widgets/misc/e-dateedit.c:320
+#: widgets/misc/e-dateedit.c:408
 #, fuzzy
 msgid "Now"
 msgstr "&No"
 
-#: widgets/misc/e-dateedit.c:326
-#, fuzzy
-msgid "Today"
-msgstr "i dag"
-
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:636 widgets/misc/e-dateedit.c:726
-#: widgets/misc/e-dateedit.c:983
+#. 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
 #, fuzzy
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:639 widgets/misc/e-dateedit.c:729
-#: widgets/misc/e-dateedit.c:986
+#. 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
 #, fuzzy
 msgid "%I:%M %p"
 msgstr "%H:%M"
@@ -4991,3 +7211,320 @@ msgstr "%H:%M"
 msgid "Group %i"
 msgstr "Gruppe %1"
 
+#~ msgid "(C) 1998 the Free Software Foundation"
+#~ msgstr "(C) 1998 the Free Software Foundation"
+
+#, fuzzy
+#~ msgid "Could not start addressbook server"
+#~ msgstr ""
+#~ "Kunne ikkje starta prosess\n"
+#~ "%1"
+
+#, fuzzy
+#~ msgid "Error while communicating with address server"
+#~ 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"
+
+#, fuzzy
+#~ msgid "window2"
+#~ msgstr "Vindauge"
+
+#, fuzzy
+#~ msgid "* Click here to add a contact *"
+#~ msgstr "Trykk her for ц╔ leggja til ein ny virtuell vert."
+
+#, fuzzy
+#~ msgid "Could not start gnomecal server"
+#~ msgstr ""
+#~ "Kunne ikkje starta prosess\n"
+#~ "%1"
+
+#, fuzzy
+#~ msgid "Year"
+#~ msgstr "ц┘r"
+
+#, fuzzy
+#~ msgid "Show 1 year"
+#~ msgstr "Vis topptekst"
+
+#, fuzzy
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "Avtale"
+
+#, fuzzy
+#~ msgid "Page Set_up"
+#~ msgstr "Speloppsett"
+
+#, fuzzy
+#~ msgid "FIXME: _New Task"
+#~ msgstr "Ny oppgц╔ve"
+
+#, fuzzy
+#~ msgid "FIXME: S_kip Occurrence"
+#~ msgstr "Fц╦rekomst"
+
+#, fuzzy
+#~ msgid "FIXME: Reply to A_ll"
+#~ msgstr "Svar til alle:"
+
+#, fuzzy
+#~ msgid "FIXME: Print..."
+#~ msgstr "Skriv &ut ..."
+
+#, fuzzy
+#~ msgid "Insert a file as an attachment"
+#~ msgstr "Meldinga har vedlegg"
+
+#, fuzzy
+#~ msgid "FIXME: Previous"
+#~ msgstr "Fц╦rre"
+
+#, fuzzy
+#~ msgid "FIXME: Next"
+#~ msgstr "Finn neste"
+
+#, fuzzy
+#~ msgid "Completion date"
+#~ msgstr "Fullfц╦ring"
+
+#, fuzzy
+#~ msgid "End date"
+#~ msgstr "Slutt-dato"
+
+#, fuzzy
+#~ msgid "Due date"
+#~ msgstr "Forfallsdato"
+
+#, fuzzy
+#~ msgid "Geographical position"
+#~ msgstr "Etikettplassering"
+
+#, fuzzy
+#~ msgid "Percent complete"
+#~ msgstr "Prosentformat"
+
+#~ msgid "Summary"
+#~ msgstr "Samandrag"
+
+#, fuzzy
+#~ msgid "Transparency"
+#~ msgstr "Gjennomsiktig "
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#, fuzzy
+#~ msgid "FIXME: Ca_lendar..."
+#~ msgstr "&Slц╔ saman kalender ..."
+
+#, fuzzy
+#~ msgid "_Summary:"
+#~ msgstr "Samandrag:"
+
+#~ msgid "Daily"
+#~ msgstr "Dagleg"
+
+#~ msgid "Weekly"
+#~ msgstr "Kvar veke"
+
+#~ msgid "Monthly"
+#~ msgstr "Kvar mц╔nad"
+
+#~ msgid "Yearly"
+#~ msgstr "Kvart ц╔r"
+
+#, fuzzy
+#~ msgid "label23"
+#~ msgstr "Etikett"
+
+#, fuzzy
+#~ msgid "Every "
+#~ msgstr "kvar"
+
+#, fuzzy
+#~ msgid "label24"
+#~ msgstr "Etikett"
+
+#, fuzzy
+#~ msgid "label25"
+#~ msgstr "Etikett"
+
+#~ msgid "Recur on the"
+#~ msgstr "Repeter pц╔ den"
+
+#, fuzzy
+#~ msgid "th day of the month"
+#~ msgstr "Dagar i mц╔naden"
+
+#, fuzzy
+#~ msgid "label27"
+#~ msgstr "Nivц╔ 27"
+
+#, fuzzy
+#~ msgid "Ending date"
+#~ msgstr "Ingen slutt-dato"
+
+#~ msgid "Change"
+#~ msgstr "Endra"
+
+#, fuzzy
+#~ msgid "Create to-do item"
+#~ msgstr "Lag mappe"
+
+#, fuzzy
+#~ msgid "Edit to-do item"
+#~ msgstr "Rediger punkt"
+
+#~ msgid "Due Date:"
+#~ msgstr "Forfallsdato:"
+
+#~ msgid "Priority:"
+#~ msgstr "Prioritet:"
+
+#, fuzzy
+#~ msgid "Time display"
+#~ msgstr "Endra tidsvising"
+
+#, fuzzy
+#~ msgid "Weeks start on"
+#~ msgstr " start"
+
+#, fuzzy
+#~ msgid "Day range"
+#~ msgstr "Dato-omrц╔de"
+
+#, fuzzy
+#~ msgid "Day start:"
+#~ msgstr " start"
+
+#, fuzzy
+#~ msgid "Day end:"
+#~ msgstr "Dag:"
+
+#, fuzzy
+#~ msgid "Colors for display"
+#~ msgstr "Farge eller pixmap"
+
+#, fuzzy
+#~ msgid "Show on TODO List:"
+#~ msgstr "Vis lang gruppeliste"
+
+#, fuzzy
+#~ msgid "Highlight not yet due items"
+#~ msgstr "&Syntaksmerkingsmodusar"
+
+#, fuzzy
+#~ msgid "To Do List"
+#~ msgstr "Hugseliste"
+
+#, fuzzy
+#~ msgid "Alarm Properties"
+#~ msgstr "Rammeeigenskapar ..."
+
+#, fuzzy
+#~ msgid " seconds"
+#~ msgstr "sekund"
+
+#, fuzzy
+#~ msgid "Cut selected item into clipboard"
+#~ msgstr "Kopierer utvalet til utklippstavla"
+
+#, fuzzy
+#~ msgid "Copy selected item into clipboard"
+#~ msgstr "Kopierer utvalet til utklippstavla"
+
+#, fuzzy
+#~ msgid "Select recipients' addresses"
+#~ msgstr "Slett denne adressa"
+
+#~ msgid "Search..."
+#~ msgstr "Sц╦k ..."
+
+#~ msgid "Name"
+#~ msgstr "Namn"
+
+#, fuzzy
+#~ msgid "To: >>"
+#~ msgstr "Til:"
+
+#, fuzzy
+#~ msgid "Cc: >>"
+#~ msgstr "Cc:"
+
+#, fuzzy
+#~ msgid "Bcc: >>"
+#~ msgstr "Bcc:"
+
+#, fuzzy
+#~ msgid "label9"
+#~ msgstr "Etikett"
+
+#, fuzzy
+#~ msgid "label7"
+#~ msgstr "Etikett"
+
+#, fuzzy
+#~ msgid "label8"
+#~ msgstr "Etikett"
+
+#, fuzzy
+#~ msgid "Load a previously saved message"
+#~ msgstr "Fц╦rre melding"
+
+#, fuzzy
+#~ msgid "_Save..."
+#~ msgstr "Lagra ..."
+
+#, fuzzy
+#~ msgid "Send _Now"
+#~ msgstr "Send &no"
+
+#, fuzzy
+#~ msgid "_Close..."
+#~ msgstr "Fargar ..."
+
+#, fuzzy
+#~ msgid "Quit the message composer"
+#~ 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\"!"
+
+#~ msgid "From"
+#~ msgstr "Frц╔"
+
+#~ msgid "To"
+#~ msgstr "Til"
+
+#~ msgid "Size"
+#~ msgstr "Storleik"
+
+#, 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 eaeac9e1fa..8d3b010e28 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.4\n"
-"POT-Creation-Date: 2000-12-11 14:54+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-12-11 14:55+01:00\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -471,99 +471,6 @@ msgstr "OppfЬring(er) hЬrer til disse kategoriene:"
 msgid "Available Categories:"
 msgstr "Tilgjengelige kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "Arbeid"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "Arbeid 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr "Faks pЕ arbeid"
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr "Tilbakering"
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "Bil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "Hjemme"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "Hjemme 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr "Faks hjemme"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-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
-msgid "Other"
-msgstr "Annet"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "Annen faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr "PersonsЬker"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr "PrimФr"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr "TTY/TTD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "PrimФr e-post"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "E-post 3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -641,6 +548,11 @@ msgstr "_Faks pЕ arbeid"
 msgid "_Mobile"
 msgstr "_Mobil"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "PrimФr e-post"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "A_rbeid"
@@ -720,6 +632,94 @@ msgstr "No_tater:"
 msgid "Details"
 msgstr "Detaljer"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Arbeid"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Arbeid 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Faks pЕ arbeid"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Tilbakering"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Bil"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Hjemme"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Hjemme 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Faks hjemme"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Annet"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Annen faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "PersonsЬker"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "PrimФr"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TTD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E-post 3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -938,6 +938,11 @@ msgstr "Velg navn"
 msgid "Select name from List:"
 msgstr "Velg navn fra liste:"
 
+#: 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.
@@ -1073,11 +1078,6 @@ msgstr ""
 "\n"
 "Dobbelklikk her for Е opprette en ny kontakt."
 
-#: 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.
@@ -1484,7 +1484,7 @@ msgstr "Ingen sammendrag tilgjengelig."
 #.
 #: 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:9
+#: po/tmp/evolution-message-composer.xml.h:8
 #: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "Lukk"
@@ -1738,33 +1738,6 @@ msgstr "minutter i forveien."
 msgid "seconds."
 msgstr "sekunder"
 
-#: calendar/gui/dialogs/task-editor.c:695
-msgid "Edit Task"
-msgstr "RedigИr oppgave"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:335
-msgid "No summary"
-msgstr "Ingen sammendrag"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:341
-#, c-format
-msgid "Appointment - %s"
-msgstr "Avtale - %s"
-
-#: calendar/gui/dialogs/task-editor.c:710 calendar/gui/event-editor.c:344
-#, c-format
-msgid "Task - %s"
-msgstr "Oppgave - %s"
-
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:347
-#, c-format
-msgid "Journal entry - %s"
-msgstr "JournaloppfЬring - %s"
-
-#: calendar/gui/dialogs/task-editor.c:1307 calendar/gui/event-editor.c:3277
-msgid "Do you want to save changes?"
-msgstr "Vil du lagre endringene?"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1853,6 +1826,33 @@ msgstr "_Status:"
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "RedigИr oppgave"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Ingen sammendrag"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Avtale - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Oppgave - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "JournaloppfЬring - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr "Vil du lagre endringene?"
+
 #: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "еpne..."
@@ -1942,41 +1942,6 @@ msgstr "Slett alle oppfЬringer"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:329
-msgid "Edit Appointment"
-msgstr "Rediger avtale"
-
-#: calendar/gui/event-editor.c:407
-msgid "on"
-msgstr "pЕ"
-
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/event-editor.c:559
-msgid "on the"
-msgstr "den"
-
-#: calendar/gui/event-editor.c:566
-msgid "th"
-msgstr "de"
-
-#: calendar/gui/event-editor.c:722
-msgid "occurrences"
-msgstr "gjentakelser"
-
-#: calendar/gui/event-editor.c:839
-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:3079 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -2137,6 +2102,41 @@ msgstr "uke(r)"
 msgid "year(s)"
 msgstr "Еr"
 
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Rediger avtale"
+
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "pЕ"
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr "den"
+
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr "de"
+
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "gjentakelser"
+
+#: calendar/gui/event-editor.c:839
+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:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a %b %d %Y"
+
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "januar"
@@ -2584,7 +2584,7 @@ msgstr "Dette Еret (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:957
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "ForhЕndsvisning av utskrift"
 
@@ -2761,6 +2761,19 @@ msgstr "URL-streng `%s' inneholder en ugyldig protokoll"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnummer i URL `%s' er ikke-numerisk"
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Fikk ikke Kerberos \"ticket\":\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr "Ugyldig svar pЕ autentisering fra tjener."
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2794,7 +2807,7 @@ msgstr "Uventet svar 'OK' fra IMAP-tjener: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:585
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -2850,57 +2863,193 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Kan ikke opprette katalog %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "Kunne ikke opprette sammendrag"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "UNIX e-postkataloger i MH-format (CamelLocal versjon)"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "For lagring av lokal e-post i MH-lignende meldingskataloger "
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX e-post filer i mbox-format (CamelLocal versjon)"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr "For lagring av lokal e-post i standard mbox format"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr "UNIX qmail maildir format postfiler (CamelLocal versjon)"
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr "For lagring av lokal e-post i qmail meldingskataloger"
+
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr "Lagerrot %s er ikke en absolutt sti"
+
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "Lagerrot %s er ikke en vanlig katalog"
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Finner ikke mappe: %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr "Lokale lager har ikke en rotmappe"
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr "Lokale lager har ikke en standardmappe"
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr "Lokale mapper kan ikke vФre rekursive."
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr "Lokal e-post-fil %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Kunne ikke endre navn pЕ mappe %s til %s: %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-store.c:297
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Kan ikke legge til melding i mbox-filen: %s"
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-store.c:306
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Kan ikke hente melding: %s"
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-mbox-provider.c:34
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX e-post filer i mbox-format"
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:36
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: 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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"For lesing av e-post levert av det lokale systemet, og for lagring av e-post "
-"pЕ lokal disk."
+"Kan ikke hente melding: %s\n"
+"  %s"
 
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+msgid "No such message"
+msgstr "Ingen slik melding"
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
+msgstr "Ugyldig meldingsinnhold"
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Kunne ikke Еpne fil `%s':\n"
+"Kan ikke Еpne mappe `%s':\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mbox-store.c:108
 #: camel/providers/local/camel-mh-store.c:103
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen `%s' eksisterer ikke."
 
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Kunne ikke opprette mappe `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' er ikke en maildir katalog."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Kunne ikke slette mappe `%s': %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "ikke en maildir katalog"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Kan ikke Еpne postboks: %s: %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Kan ikke legge til melding i mbox-filen: %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
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Kan ikke hente melding: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "Mappen ser ut til Е ha blitt korrupt og kan ikke repareres."
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "Oppbygging av melding feilet: Korrupt postboks?"
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Kunne ikke Еpne fil `%s':\n"
+"%s"
+
 #: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2911,16 +3060,12 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:126
 #: camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' er ikke en vanlig fil."
 
 #: camel/providers/local/camel-mbox-store.c:145
 #: camel/providers/local/camel-mbox-store.c:168
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2930,175 +3075,85 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "MAppen `%s' er ikke tom. Ikke slettet."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
+#: camel/providers/local/camel-mbox-summary.c:234
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Kunne ikke endre navn pЕ mappe %s til %s: mЕlet eksisterer"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Kunne ikke Еpne mappe: %s: lager sammendrag fra posisjon %ld: %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox-mapper kan ikke vФre rekursive."
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "Fatal feil i lesing av postboksen nФr posisjon %ld i mappe %s"
 
-#: camel/providers/local/camel-local-store.c:200
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:341
 #, c-format
-msgid "Local mail file %s"
-msgstr "Lokal e-post-fil %s"
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
 #, c-format
-msgid "Could not open summary %s"
-msgstr "Kunne ikke Еpne sammendrag %s"
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Kan ikke Еpne mappe for Е lage sammendrag: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:491
-#: camel/providers/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan ikke Еpne midlertidig postboks: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
-msgstr "Feil i sammendrag, avbryter synkronisering"
-
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Feil i sammendrag, X-Evolution topptekst mangler"
+#: 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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
 
 #: camel/providers/local/camel-mbox-summary.c:562
-#: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Feil under skriving til midlertidig postboks: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Kan ikke kopiere data til utfil: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Skriving til midlertidig postboks feilet: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:595
 #: camel/providers/local/camel-mbox-summary.c:748
-#: camel/providers/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunne ikke lukke kildemappe %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:604
-#: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:615
-#: camel/providers/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunne ikke endre navn pЕ mappe: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:817
-#: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Ukjent feil: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "Kunne ikke laste eller opprette sammendrag"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
-msgstr "Kan ikke legge til melding i mh-mappe: %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-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Kan ikke hente melding: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "UNIX e-postkataloger i MH-format"
-
-#: camel/providers/local/camel-local-provider.c:37
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "For lagring av lokal e-post i MH-lignende meldingskataloger "
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kan ikke Еpne mappe `%s':\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kunne ikke opprette mappe `%s':\n"
-"%s"
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:116
-#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' er ikke en katalog."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Kunne ikke slette mappe `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Kunne ikke endre navn pЕ mappe `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Kunne ikke endre navn pЕ mappe `%s': %s eksisterer"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH-mapper kan ikke vФre rekursive."
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Lokal e-postkatalog %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3453,7 +3508,7 @@ msgstr "Emne:"
 msgid "Enter the subject of the mail"
 msgstr "Skriv inn emnet for meldingen"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3462,38 +3517,38 @@ msgstr ""
 "Kunne ikke Еpne signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Lagre som..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Feil under lagring av fil: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Feil under lasting av fil: %s"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Lagre endringer i meldingen..."
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Lagre endringer til meldingen..."
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Feil under lagring av brevet i 'Skisser': %s"
 
-#: composer/e-msg-composer.c:738 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:744
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3503,27 +3558,27 @@ msgstr ""
 "\n"
 "Vil du lagre endringene?"
 
-#: composer/e-msg-composer.c:766
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "еpne fil"
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Filen eksisterer ikke."
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Er ikke en vanlig fil."
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Filen eksisterer men er ikke lesbar."
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:923
 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:944
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3531,15 +3586,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:965
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "En feil oppsto under lesing fra filen."
 
-#: composer/e-msg-composer.c:1342
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Skriv en melding"
 
-#: composer/e-msg-composer.c:1419
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Kan ikke opprette komponeringsvinduet."
 
@@ -3547,7 +3602,7 @@ msgstr "Kan ikke opprette komponeringsvinduet."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan ikke initiere Evolutions composer."
 
-#: filter/e-search-bar.c:175
+#: filter/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "SЬ_k"
 
@@ -3680,15 +3735,15 @@ msgstr ""
 "Du glemte Е velge en meppe.\n"
 "Vennligst gЕ tilbake og spesifisИr en gyldig mappe for levering av e-post."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Velg mappe"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Skriv inn URI for mappen"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<klikk her for Е velge en mappe>"
 
@@ -3956,16 +4011,16 @@ msgstr "Legg til regel for VFolder"
 msgid "Edit VFolder Rule"
 msgstr "RedigИr VFolder regel"
 
-#: mail/component-factory.c:203
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan ikke initiere Evolutions e-postkomponent."
 
-#: mail/component-factory.c:242
+#: mail/component-factory.c:266
 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:17
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Lagre"
 
@@ -4017,7 +4072,7 @@ msgstr "FiltrИr etter mottaker"
 msgid "Filter on Mailing List"
 msgstr "FiltrИr etter e-postliste"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "еpne"
 
@@ -4156,15 +4211,15 @@ msgstr ""
 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:543
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Flytt melding(er) til"
 
-#: mail/mail-callbacks.c:545
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "KopiИr melding(er) til"
 
-#: mail/mail-callbacks.c:660
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4172,11 +4227,11 @@ msgstr ""
 "Du kan kun redigere meldinger lagret\n"
 "i Skisser-katalogen."
 
-#: mail/mail-callbacks.c:694 mail/mail-display.c:72
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
 msgid "Overwrite file?"
 msgstr "Overskriv fil?"
 
-#: mail/mail-callbacks.c:698 mail/mail-display.c:76
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4184,15 +4239,15 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: mail/mail-callbacks.c:743
+#: mail/mail-callbacks.c:748
 msgid "Save Message As..."
 msgstr "Lagre melding som..."
 
-#: mail/mail-callbacks.c:745
+#: mail/mail-callbacks.c:750
 msgid "Save Messages As..."
 msgstr "Lagre meldinger som..."
 
-#: mail/mail-callbacks.c:872
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4201,14 +4256,46 @@ msgstr ""
 "Feil under lasting av filter-informasjon:\n"
 "%s"
 
-#: mail/mail-callbacks.c:917
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/mail-callbacks.c:964
+#: mail/mail-callbacks.c:969
 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
+msgid "Identity"
+msgstr "Identitet"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "E-post-konfigurasjon"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "E-post-kilde"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "E-post-transport"
+
+#: 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"
+
+#: po/tmp/mail-config-druid.glade.h:14
+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"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4358,38 +4445,6 @@ msgstr "SpЬr etter autorisasjonsegenskaper for \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "SpЬr etter autorisasjon hos \"%s\""
 
-#.
-#. * 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
-msgid "Identity"
-msgstr "Identitet"
-
-#: po/tmp/mail-config-druid.glade.h:7
-msgid "Mail Configuration"
-msgstr "E-post-konfigurasjon"
-
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "E-post-kilde"
-
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "E-post-transport"
-
-#: 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"
-
-#: po/tmp/mail-config-druid.glade.h:14
-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"
-
 #: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adresse"
@@ -4426,35 +4481,20 @@ msgstr "Send meldinger i HTML-format"
 msgid "Sources"
 msgstr "Kilder"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Kunne ikke opprette rЬr til %s: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Kunne ikke kjЬre %s: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Kan ikke kjЬre fork pЕ %s: %s"
-
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Vennligst skriv inn din PGP/GPG passphrase."
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Ingen passord gitt."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, 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:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Ingen GPG/PGP-program tilgjengelig."
 
@@ -4532,31 +4572,31 @@ msgstr "Kryptert melding"
 msgid "Click icon to decrypt."
 msgstr "Klikk pЕ ikonet for Е dekryptere."
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/mail-format.c:1478
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig pЕ nettsted \"%s\""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/mail-format.c:1516
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjent ekstern data (\"%s\"-type)"
 
-#: mail/mail-format.c:1521
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern-kropp."
 
-#: mail/mail-format.c:1691
+#: mail/mail-format.c:1695
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s, skrev %s:\n"
@@ -4728,166 +4768,166 @@ msgstr "Merk meldinger i mappe \"%s\""
 msgid "Marking message %d of %d"
 msgstr "Merker melding %d av %d"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1300
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Skann foldere i \"%s\""
 
-#: mail/mail-ops.c:1369 mail/subscribe-dialog.c:339
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Ingen beskrivelse)"
 
-#: mail/mail-ops.c:1430
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Legger ved meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:1433
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Legg ved meldinger fra \"%s\""
 
-#: mail/mail-ops.c:1533
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Videresender meldinger \"%s\""
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Videresender en melding uten emne"
 
-#: mail/mail-ops.c:1540
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Videresend meldingen \"%s\""
 
-#: mail/mail-ops.c:1544
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Videresend en melding uten emne"
 
-#: mail/mail-ops.c:1591
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Henter melding nummer %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1608
+#: mail/mail-ops.c:1610
 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:1663
+#: mail/mail-ops.c:1665
 msgid "Forwarded messages"
 msgstr "Videresendte meldinger"
 
-#: mail/mail-ops.c:1677
+#: mail/mail-ops.c:1679
 msgid "Forwarded message:\n"
 msgstr "Videresendt melding:\n"
 
-#: mail/mail-ops.c:1746
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Laster \"%s\""
 
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Last \"%s\""
 
-#: mail/mail-ops.c:1851
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Oppretter \"%s\""
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Opprett \"%s\""
 
-#: mail/mail-ops.c:1901
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr "Unntak under rapportering av resultat til skallkomponentens lytter."
 
-#: mail/mail-ops.c:1947
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniserer \"%s\""
 
-#: mail/mail-ops.c:1949
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "SynkronisИr \"%s\""
 
-#: mail/mail-ops.c:2013
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Viser melding-UID \"%s\""
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "TЬmmer meldingsvisning"
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Vis meldings-UID \"%s\""
 
-#: mail/mail-ops.c:2022
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "TЬm meldingsvisning"
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "еpner meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2138
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "еpne meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2242
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Laster %s-mappe"
 
-#: mail/mail-ops.c:2244
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "Last %s-mappe"
 
-#: mail/mail-ops.c:2308
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Viser meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2311
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Vis meldinger fra \"%s\""
 
-#: mail/mail-ops.c:2337
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Henter melding %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2426
+#: mail/mail-ops.c:2428
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Lagrer meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2429
+#: mail/mail-ops.c:2431
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Lagre meldinger fra mappe \"%s\""
 
-#: mail/mail-ops.c:2472
+#: mail/mail-ops.c:2474
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Lagrer melding %d av %d (uid \"%s\")"
@@ -4896,7 +4936,7 @@ msgstr "Lagrer melding %d av %d (uid \"%s\")"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: mail/mail-summary.c:104 mail/mail-threads.c:728
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "Uferdig melding skrevet pЕ rЬr!"
 
@@ -5030,38 +5070,38 @@ msgstr "Skriv ut den valgte meldingen"
 msgid "Delete this message"
 msgstr "Slett denne meldingen"
 
-#: mail/message-list.c:574
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:577
+#: mail/message-list.c:575
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:580
+#: mail/message-list.c:578
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:848
+#: mail/message-list.c:846
 #, 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:860 mail/message-list.c:875
+#: mail/message-list.c:858 mail/message-list.c:873
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:862 mail/message-list.c:877
+#: mail/message-list.c:860 mail/message-list.c:875
 msgid "<unknown>"
 msgstr "<ukjent>"
 
-#: mail/message-list.c:2159
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "Bygger opp meldingsvisningen pЕ nytt"
 
-#: mail/message-list.c:2161
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Gjenoppbygg meldingsvisningen"
 
@@ -5334,6 +5374,16 @@ 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:43 po/tmp/evolution.xml.h:34
+#: shell/e-storage-set-view.c:235
+msgid "_View"
+msgstr "_Vis"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Vis den valgte mappen"
+
 #: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Uten navn)"
@@ -5382,16 +5432,6 @@ msgstr "Operasjonen er ikke stЬttet"
 msgid "The specified type is not supported in this storage"
 msgstr "Spesifisert type er ikke stЬttet for dette lageret"
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
-msgid "_View"
-msgstr "_Vis"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Vis den valgte mappen"
-
 #: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -5661,7 +5701,7 @@ 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:19
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "L_agre som..."
 
@@ -5689,7 +5729,7 @@ 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:40
+#: po/tmp/evolution-message-composer.xml.h:38
 #: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "_Fil"
@@ -5700,7 +5740,7 @@ 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:44
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Lagre"
 
@@ -5937,7 +5977,7 @@ 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
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "F_ormat"
 
@@ -6014,7 +6054,7 @@ 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:22
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Lagre aktiv fil"
 
@@ -6059,12 +6099,12 @@ msgid "Undo the last action"
 msgstr "Angre siste handling"
 
 #: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "_Om..."
 
 #: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "L_ukk"
 
@@ -6073,12 +6113,12 @@ msgid "_Copy"
 msgstr "_KopiИr"
 
 #: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr "_FeilsЬk"
 
 #: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-message-composer.xml.h:37
 #: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "R_edigИr"
@@ -6092,7 +6132,7 @@ msgid "_Forms"
 msgstr "Sk_jemaer"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -6324,99 +6364,91 @@ msgstr "Redigering av _virtuelle mapper"
 msgid "Attach"
 msgstr "Legg ved"
 
-#: po/tmp/evolution-message-composer.xml.h:8
-msgid "Bold"
-msgstr "Uthevet"
-
-#: po/tmp/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Lukk aktiv fil"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "Insert a file as text into the message"
 msgstr "Sett inn en tekstfil i meldingen"
 
-#: po/tmp/evolution-message-composer.xml.h:14
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "Sett inn tekstfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "еpne en fil"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Lagre som"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "Lagre i _mappe..."
 
-#: po/tmp/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Lagre i mappe..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Lagre aktiv fil med et nytt navn"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Lagre meldingen i en spesifisert mappe"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Send"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "Send se_nere"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "Send se_nere"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "Send meldingen i HTML-format"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "Send meldingen senere"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "Send meldingen nЕ"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "Send denne meldingen nЕ"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Sets something as bold"
-msgstr "Setter utvalg til uthevet"
-
-#: po/tmp/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "Vis/skjul vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "Vis _vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "Vis vedlegg"
 
-#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "Sett _inn tekstfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "_еpne..."
 
@@ -6548,6 +6580,13 @@ msgstr "Inn_stillinger"
 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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Tentativ"
@@ -6624,13 +6663,6 @@ msgstr "Tid for mЬtets slutt:"
 msgid "All Attendees"
 msgstr "Alle deltakere"
 
-#. 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
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6661,176 +6693,78 @@ msgstr "%I:%M %p"
 msgid "Group %i"
 msgstr "Gruppe %i"
 
-#: camel/providers/imap/camel-imap-auth.c:124
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Fikk ikke Kerberos \"ticket\":\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-auth.c:195
-msgid "Bad authentication response from server."
-msgstr "Ugyldig svar pЕ autentisering fra tjener."
-
-#: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "UNIX e-postkataloger i MH-format (CamelLocal versjon)"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "UNIX e-post filer i mbox-format (CamelLocal versjon)"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "For lagring av lokal e-post i standard mbox format"
-
-#: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr "UNIX qmail maildir format postfiler (CamelLocal versjon)"
-
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "For lagring av lokal e-post i qmail meldingskataloger"
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Lagerrot %s er ikke en absolutt sti"
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Lagerrot %s er ikke en vanlig katalog"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Finner ikke mappe: %s: %s"
-
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Lokale lager har ikke en rotmappe"
+#~ msgid "Could not create summary"
+#~ msgstr "Kunne ikke opprette sammendrag"
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Lokale lager har ikke en standardmappe"
+#~ msgid "Cannot append message to mbox file: %s"
+#~ msgstr "Kan ikke legge til melding i mbox-filen: %s"
 
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Lokale mapper kan ikke vФre rekursive."
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Kan ikke hente melding: %s"
 
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Kunne ikke endre navn pЕ mappe %s til %s: %s"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "UNIX e-post filer i mbox-format"
 
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Kunne ikke slette sammendragsfil for mappe `%s': %s"
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "For lesing av e-post levert av det lokale systemet, og for lagring av e-post "
+#~ "pЕ lokal disk."
 
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Kunne ikke slette indeksfil for mappe `%s': %s"
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Kunne ikke endre navn pЕ mappe %s til %s: mЕlet eksisterer"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan ikke legge til melding i maildir mappe: %s: %s"
+#~ msgid "Mbox folders may not be nested."
+#~ msgstr "Mbox-mapper kan ikke vФre rekursive."
 
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Ingen slik melding"
+#~ msgid "Could not open summary %s"
+#~ msgstr "Kunne ikke Еpne sammendrag %s"
 
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
-msgid "Invalid message contents"
-msgstr "Ugyldig meldingsinnhold"
+#~ msgid "Summary mismatch, aborting sync"
+#~ msgstr "Feil i sammendrag, avbryter synkronisering"
 
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "`%s' er ikke en maildir katalog."
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Feil i sammendrag, X-Evolution topptekst mangler"
 
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "ikke en maildir katalog"
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Kan ikke kopiere data til utfil: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:195
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kan ikke Еpne postboks: %s: %s\n"
+#~ msgid "Could not load or create summary"
+#~ msgstr "Kunne ikke laste eller opprette sammendrag"
 
-#: camel/providers/local/camel-mbox-folder.c:251
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan ikke legge til melding i mbox-filen: %s: %s"
+#~ msgid "Cannot append message to mh folder: %s"
+#~ msgstr "Kan ikke legge til melding i mh-mappe: %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
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan ikke hente melding: %s fra mappe %s\n"
-"  %s"
+#~ msgid "UNIX MH-format mail directories"
+#~ msgstr "UNIX e-postkataloger i MH-format"
 
-#: camel/providers/local/camel-mbox-folder.c:358
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Mappen ser ut til Е ha blitt korrupt og kan ikke repareres."
+#~ msgid "Could not rename folder `%s': %s"
+#~ msgstr "Kunne ikke endre navn pЕ mappe `%s': %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Oppbygging av melding feilet: Korrupt postboks?"
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Kunne ikke endre navn pЕ mappe `%s': %s eksisterer"
 
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Kunne ikke Еpne mappe: %s: lager sammendrag fra posisjon %ld: %s"
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH-mapper kan ikke vФre rekursive."
 
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Fatal feil i lesing av postboksen nФr posisjon %ld i mappe %s"
+#~ msgid "Local mail directory %s"
+#~ msgstr "Lokal e-postkatalog %s"
 
-#: camel/providers/local/camel-mbox-summary.c:341
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Kan ikke lage sammendrag for mappe: %s: %s"
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Kunne ikke opprette rЬr til %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Kan ikke Еpne mappe for Е lage sammendrag: %s: %s"
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Kunne ikke kjЬre %s: %s\n"
 
-#: 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
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Feil i sammendrag og mappe, selv etter synkronisering"
+#~ msgid "Cannot fork %s: %s"
+#~ msgstr "Kan ikke kjЬre fork pЕ %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Skriving til midlertidig postboks feilet: %s: %s"
+#~ msgid "Bold"
+#~ msgstr "Uthevet"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan ikke legge til melding i mh-mappe: %s: %s"
+#~ msgid "Sets something as bold"
+#~ msgstr "Setter utvalg til uthevet"
 
 #~ msgid "Cannot initialize Evolution's mail summary component."
 #~ msgstr "Kan ikke initiere Evolution's e-postsammendrag-komponent."
diff --git a/po/pl.po b/po/pl.po
index e2545f3f79..5ef5c5c449 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2000-11-30 13:59+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -9,11 +9,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr "Karta: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3048
 msgid ""
 "\n"
 "Name: "
@@ -21,7 +21,7 @@ msgstr ""
 "\n"
 "Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3049
 msgid ""
 "\n"
 "  Prefix:     "
@@ -29,25 +29,25 @@ msgstr ""
 "\n"
 "  Przedrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3050
 msgid ""
 "\n"
 "  Given:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "  Additional: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Suffix:     "
@@ -55,7 +55,7 @@ msgstr ""
 "\n"
 "  Przyrostek: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3067
 msgid ""
 "\n"
 "Birth Date: "
@@ -63,7 +63,7 @@ msgstr ""
 "\n"
 "Data urodzenia: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3078
 msgid ""
 "\n"
 "Address:"
@@ -71,7 +71,7 @@ msgstr ""
 "\n"
 "Adres:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3080
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -79,13 +79,13 @@ msgstr ""
 "\n"
 "  Skrzynka pocztowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "  Ext:         "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3082
 msgid ""
 "\n"
 "  Street:      "
@@ -93,7 +93,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  City:        "
@@ -101,13 +101,13 @@ msgstr ""
 "\n"
 "  Miasto:      "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
@@ -115,7 +115,7 @@ msgstr ""
 "\n"
 "  Kod pocztowy: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
@@ -123,13 +123,13 @@ msgstr ""
 "\n"
 "  Kraj:        "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3099
 msgid ""
 "\n"
 "Delivery Label: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3111
 msgid ""
 "\n"
 "Telephones:\n"
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "Telefony:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3138
 msgid ""
 "\n"
 "E-mail:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "E-mail:\n"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:"
@@ -161,13 +161,13 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3160
 msgid ""
 "\n"
 "Mailer: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3166
 msgid ""
 "\n"
 "Time Zone: "
@@ -175,7 +175,7 @@ msgstr ""
 "\n"
 "Strefa czasowa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3174
 msgid ""
 "\n"
 "Geo Location: "
@@ -183,7 +183,7 @@ msgstr ""
 "\n"
 "PoЁo©enie geograficzne: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3178
 msgid ""
 "\n"
 "Business Role: "
@@ -191,13 +191,13 @@ msgstr ""
 "\n"
 "Stanowisko sЁu©bowe: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3190
 msgid ""
 "\n"
 "Org: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3191
 msgid ""
 "\n"
 "  Name:  "
@@ -205,7 +205,7 @@ msgstr ""
 "\n"
 "  Nazwa: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3192
 msgid ""
 "\n"
 "  Unit:  "
@@ -213,7 +213,7 @@ msgstr ""
 "\n"
 "  Jednostka: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
@@ -221,7 +221,7 @@ msgstr ""
 "\n"
 "  Jednostka2: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
@@ -229,7 +229,7 @@ msgstr ""
 "\n"
 "  Jednostka3: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
@@ -237,7 +237,7 @@ msgstr ""
 "\n"
 "  Jednostka4: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "Categories: "
@@ -245,7 +245,7 @@ msgstr ""
 "\n"
 "Kategorie: "
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "Comment: "
@@ -263,13 +263,13 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "Unique String: "
 msgstr ""
 
-#: addressbook/backend/ebook/e-card.c:1
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Public Key: "
@@ -277,14 +277,14 @@ msgstr ""
 "\n"
 "Klucz publiczny: "
 
-#: addressbook/backend/ebook/load-gnomecard-addressbook.c:1
-#: addressbook/backend/ebook/load-pine-addressbook.c:1
-#: addressbook/backend/ebook/test-client-list.c:1
-#: addressbook/backend/ebook/test-client.c:1
-#: addressbook/conduit/address-conduit.c:1
-#: addressbook/gui/component/addressbook-factory.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1 calendar/gui/main.c:1
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: 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/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
 msgid "Could not initialize Bonobo"
 msgstr "Nie mo©na zainicjowaФ Bonobo"
 
@@ -292,112 +292,112 @@ msgstr "Nie mo©na zainicjowaФ Bonobo"
 #. in GnomePilotConduitSyncType as they are used as index.
 #. Custom type implies Disabled state.
 #.
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:77
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
+#: calendar/conduits/todo/todo-conduit-control-applet.c:77
 msgid "Disabled"
 msgstr "Nieaktywne"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:78
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
+#: calendar/conduits/todo/todo-conduit-control-applet.c:78
 msgid "Synchronize"
 msgstr "Zsynchronizuj"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:79
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
+#: calendar/conduits/todo/todo-conduit-control-applet.c:79
 msgid "Copy From Pilot"
 msgstr "Skopiuj z pilota"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:80
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
+#: calendar/conduits/todo/todo-conduit-control-applet.c:80
 msgid "Copy To Pilot"
 msgstr "Skopiuj na pilota"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:81
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
+#: calendar/conduits/todo/todo-conduit-control-applet.c:81
 msgid "Merge From Pilot"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:82
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
+#: calendar/conduits/todo/todo-conduit-control-applet.c:82
 msgid "Merge To Pilot"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
 msgid "JP Rosevear <jpr@helixcode.com>"
 msgstr "JP Rosevear <jpr@helixcode.com>"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
 msgid "Original Author:"
 msgstr "Oryginalny autor:"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:123
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
 msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr "Eskil Heyn Olsen <deity@eskil.dk>"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:127
 msgid "Evolution Addressbook Conduit"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
 msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
 msgstr "(C) 1998-2000 the Free Software Foundation oraz Helix Code"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:130
 msgid "Configuration utility for the evolution addressbook conduit.\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:131
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
 msgid "gnome-unknown.xpm"
 msgstr "gnome-unknown.xpm"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:162
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
+#: calendar/conduits/todo/todo-conduit-control-applet.c:162
 msgid "Synchronize Action"
 msgstr "Czynno╤Ф synchronizacji"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:214
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
 msgid "Conduit state"
 msgstr "Stan poЁ╠czenia"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
 msgid ""
 "No pilot configured, please choose the\n"
 "'Pilot Link Properties' capplet first."
 msgstr ""
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:285
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
+#: calendar/conduits/todo/todo-conduit-control-applet.c:285
 msgid "Not connected to the gnome-pilot daemon"
 msgstr "Brak poЁ╠czenia z demonem gnome-pilot"
 
-#: addressbook/conduit/address-conduit-control-applet.c:1
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: addressbook/conduit/address-conduit-control-applet.c:290
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
 msgid ""
 "An error occured when trying to fetch\n"
 "pilot list from the gnome-pilot daemon"
@@ -405,28 +405,28 @@ msgstr ""
 "Podczas prСby pobrania listy pilotСw od demona\n"
 "gnome-pilot wyst╠piЁ bЁ╠d"
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Nie mo©na uruchomiФ serwera wombat"
 
-#: addressbook/conduit/address-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Nie mo©na uruchomiФ wombata"
 
-#: addressbook/conduit/address-conduit.c:1
-#: addressbook/conduit/address-conduit.c:1
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -435,117 +435,23 @@ msgstr ""
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
-#: addressbook/contact-editor/categories-strings.h:1
+#: addressbook/contact-editor/categories-strings.h:7
 msgid "categories"
 msgstr "kategorie"
 
-#: addressbook/contact-editor/categories-strings.h:1
+#: 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:1
+#: addressbook/contact-editor/categories-strings.h:9
 msgid "Available Categories:"
 msgstr "DostЙpne kategorie:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Assistant"
-msgstr "Asystent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Business"
-msgstr "Praca"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Business 2"
-msgstr "Praca 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Business Fax"
-msgstr "Faks sЁu©bowy"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Car"
-msgstr "SamochСd"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Company"
-msgstr "Firma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Home"
-msgstr "Dom"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Home 2"
-msgstr "Dom 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Home Fax"
-msgstr "Faks w domu"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Mobile"
-msgstr "Przeno╤ny"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-#: addressbook/contact-editor/e-contact-editor.c:1
-#: mail/mail-config.glade.h:1
-msgid "Other"
-msgstr "Inne"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Other Fax"
-msgstr "Inny faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Pager"
-msgstr "Pager"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Primary"
-msgstr "GЁСwny"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Radio"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Telex"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "TTY/TDD"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Primary Email"
-msgstr "GЁСwny e-mail"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1
-msgid "Email 3"
-msgstr "E-mail 3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:1
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Usun╠Ф kontakt?"
 
@@ -554,184 +460,289 @@ msgstr "Usun╠Ф kontakt?"
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:7
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-mail.xml.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_UsuЯ"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "Typy telefonСw"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:10
+#: addressbook/contact-editor/e-contact-editor-strings.h:12
 msgid "New phone type"
 msgstr "Nowy typ telefonu"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1 filter/filter.glade.h:1
-#: mail/mail-config.glade.h:1
+#: 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
 msgid "Add"
 msgstr "Dodaj"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:13
 msgid "Contact Editor"
 msgstr "Edytor kontaktСw"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:14
 msgid "_Full Name..."
 msgstr "_PeЁna nazwa..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:15
 msgid "File As:"
 msgstr "Zapisz jako:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:16
 msgid "Web page address:"
 msgstr "Adres strony WWW:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:17
 msgid "Wants to receive _HTML mail"
 msgstr "Chce otrzymywaФ listy w HTML-u"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:18
 msgid "_Business"
 msgstr "_Praca"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Home"
 msgstr "_Dom"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
 msgid "Business _Fax"
 msgstr "_Faks sЁu©bowy"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
 msgid "_Mobile"
 msgstr "P_rzeno╤ny"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "GЁСwny e-mail"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "_Praca"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
 msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
 msgid "C_ontacts..."
 msgstr "_Kontakty..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "K_ategorie..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
 msgstr "TytuЁ _sЁu©bowy:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Company:"
 msgstr "_Firma:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
 msgid "_Address..."
 msgstr "_Adres..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "OgСlne"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:31
 msgid "_Department:"
 msgstr "_OddziaЁ:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:32
 msgid "_Office:"
 msgstr "_Biuro:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:33
 msgid "_Profession:"
 msgstr "_ZawСd:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:34
 msgid "_Nickname:"
 msgstr "_Przydomek:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:35
 msgid "_Spouse:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:36
 msgid "_Birthday:"
 msgstr "_Urodziny:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:37
 msgid "_Assistant's name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:38
 msgid "_Manager's Name:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:39
 msgid "Anni_versary:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:40
 msgid "No_tes:"
 msgstr "_Notatki:"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:1
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: addressbook/contact-editor/e-contact-editor-strings.h:41
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "SzczegСЁy"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Asystent"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Praca"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Praca 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Faks sЁu©bowy"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "SamochСd"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Firma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Dom"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Dom 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Faks w domu"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Inne"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Inny faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Pager"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "GЁСwny"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E-mail 3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: po/tmp/fulladdr.glade.h:6
 msgid "Address _2:"
 msgstr "Adres _2:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: po/tmp/fulladdr.glade.h:7
+#, fuzzy
+msgid "Canada"
+msgstr "Terminarz"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: po/tmp/fulladdr.glade.h:9
 msgid "Countr_y:"
 msgstr "_Kraj:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: po/tmp/fulladdr.glade.h:10
+#, fuzzy
+msgid "Finland"
+msgstr "Znajd╪"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Miasto:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr ""
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Stan/Prowincja:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:1
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr ""
 
@@ -740,11 +751,11 @@ msgstr ""
 #. * Add this file to your project's POTFILES.in.
 #. * DO NOT compile it as part of your application.
 #.
-#: addressbook/contact-editor/fullname-strings.h:1
+#: addressbook/contact-editor/fullname-strings.h:7
 msgid "Check Full Name"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:1
+#: addressbook/contact-editor/fullname-strings.h:8
 msgid ""
 "\n"
 "Mr.\n"
@@ -756,7 +767,7 @@ msgstr ""
 "Pani\n"
 "Dr\n"
 
-#: addressbook/contact-editor/fullname-strings.h:1
+#: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
 "\n"
 "Sr.\n"
@@ -767,45 +778,44 @@ msgid ""
 "Esq.\n"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:1
+#: addressbook/contact-editor/fullname-strings.h:21
 msgid "_First:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:1
+#: addressbook/contact-editor/fullname-strings.h:22
 msgid "_Title:"
 msgstr "_TytuЁ:"
 
-#: addressbook/contact-editor/fullname-strings.h:1
+#: addressbook/contact-editor/fullname-strings.h:23
 msgid "_Middle:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:1
+#: addressbook/contact-editor/fullname-strings.h:24
 msgid "_Last:"
 msgstr ""
 
-#: addressbook/contact-editor/fullname-strings.h:1
+#: addressbook/contact-editor/fullname-strings.h:25
 msgid "_Suffix:"
 msgstr "_Przyrostek:"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:1
-#: ui/evolution-addressbook.xml.h:1
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Jako _tabela"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Nie mo©na otworzyФ ksi╠©ki adresowej"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -814,107 +824,221 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1 mail/folder-browser.c:1
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
 msgid "Show All"
 msgstr "Wy╤wietl wszystkie"
 
-#: addressbook/gui/component/addressbook.c:1 mail/folder-browser.c:1
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:533
 msgid "Any field contains"
 msgstr "Jakiekolwiek pole zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:534
 msgid "Name contains"
 msgstr "Nazwa zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:535
 msgid "Email contains"
 msgstr "E-mail zawiera"
 
-#: addressbook/gui/component/addressbook.c:1
+#: addressbook/gui/component/addressbook.c:621
 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:1
+#: addressbook/gui/component/e-ldap-storage.c:88
 msgid "External Directories"
 msgstr "ZewnЙtrzne katalogi"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:1
-#: composer/e-msg-composer-attachment.glade.h:1
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Opis:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:1
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "Serwer LDAP:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:1
+#: po/tmp/ldap-server-dialog.glade.h:8
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:1
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Numer portu:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:1
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Znajd╪..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: po/tmp/select-names.glade.h:7
 msgid "Message Recipients"
 msgstr "Odbiorcy listu"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: po/tmp/select-names.glade.h:8
 msgid "Select Names"
 msgstr "Wybierz nazw"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:1
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Wybierz nazwЙ z listy:"
 
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "Wyszukiwanie"
+
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:1
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:1
-msgid "window2"
-msgstr "okno2"
+#: po/tmp/alphabet.glade.h:7
+#, fuzzy
+msgid "a"
+msgstr "am"
+
+#: po/tmp/alphabet.glade.h:8
+msgid "b"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:9
+msgid "c"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:10
+msgid "d"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:11
+#, fuzzy
+msgid "e"
+msgstr "╕r"
+
+#: po/tmp/alphabet.glade.h:12
+#, fuzzy
+msgid "f"
+msgstr "Lista warunkСw"
+
+#: po/tmp/alphabet.glade.h:13
+msgid "g"
+msgstr ""
+
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+msgid "h"
+msgstr "h"
+
+#: po/tmp/alphabet.glade.h:15
+#, fuzzy
+msgid "i"
+msgstr "jest"
+
+#: po/tmp/alphabet.glade.h:16
+msgid "j"
+msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1
-#: addressbook/gui/widgets/e-minicard.c:1
+#: po/tmp/alphabet.glade.h:17
+#, fuzzy
+msgid "k"
+msgstr "Ok"
+
+#: po/tmp/alphabet.glade.h:18
+msgid "l"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:19
+#, fuzzy
+msgid "m"
+msgstr "am"
+
+#: po/tmp/alphabet.glade.h:20
+msgid "n"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:21
+#, fuzzy
+msgid "o"
+msgstr "Po"
+
+#: po/tmp/alphabet.glade.h:22
+#, fuzzy
+msgid "p"
+msgstr "pm"
+
+#: po/tmp/alphabet.glade.h:23
+msgid "q"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:24
+#, fuzzy
+msgid "r"
+msgstr "Pt"
+
+#: po/tmp/alphabet.glade.h:25
+#, fuzzy
+msgid "s"
+msgstr "jest"
+
+#: po/tmp/alphabet.glade.h:26
+#, fuzzy
+msgid "t"
+msgstr "."
+
+#: po/tmp/alphabet.glade.h:27
+#, fuzzy
+msgid "u"
+msgstr "Ni"
+
+#: po/tmp/alphabet.glade.h:28
+msgid "v"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:29
+msgid "w"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:30
+msgid "x"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:31
+msgid "y"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:32
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Zapisz jako VCard"
 
-#: addressbook/gui/widgets/e-minicard-control.c:1
+#: addressbook/gui/widgets/e-minicard-control.c:278
 msgid "Save in addressbook"
 msgstr "Zapisz w ksi╠©ce adresowej"
 
-#: addressbook/gui/widgets/e-minicard-view.c:1
+#: addressbook/gui/widgets/e-minicard-view.c:111
 msgid ""
 "\n"
 "\n"
@@ -923,343 +1047,333 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:1
-#: mail/mail-search-dialogue.c:1
-msgid "Search"
-msgstr "Wyszukiwanie"
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:6
 msgid "10 pt. Tahoma"
 msgstr "10-punktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:7
 msgid "8 pt. Tahoma"
 msgstr "8-ounktowa Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:8
 msgid "Blank forms at end:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:9
 msgid "Body"
 msgstr "Tre╤Ф"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:10
 msgid "Bottom:"
 msgstr "DСЁ:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:11
 msgid "Dimensions:"
 msgstr "Wymiary:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:12
 msgid "Font..."
 msgstr "Czcionka..."
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:14
 msgid "Footer:"
 msgstr "Stopka:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:15
 msgid "Format"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:16
 msgid "Header"
 msgstr "GЁСwka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:17
 msgid "Header/Footer"
 msgstr "GЁСwka/Stopka"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:19
 msgid "Headings for each letter"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:20
 msgid "Height:"
 msgstr "Wysoko╤Ф:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:21
 msgid "Immediately follow each other"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:22
 msgid "Include:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:23
 msgid "Landscape"
 msgstr "Pejza©"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:24
 msgid "Left:"
 msgstr "Lewy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:25
 msgid "Letter tabs on side"
 msgstr "ZakЁadki liter z boku"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:26
 msgid "Margins"
 msgstr "Marginesy"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:27
 msgid "Number of columns:"
 msgstr "Liczba kolumn:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:28
 msgid "Options"
 msgstr "Opcje"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:29
 msgid "Orientation"
 msgstr "UЁo©enie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:30
 msgid "Page"
 msgstr "Strona"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:31
 msgid "Page Setup:"
 msgstr "Ustawienia strony:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:32
 msgid "Paper"
 msgstr "Papier"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "╛rСdЁo papieru:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:34
 msgid "Portrait"
 msgstr "Portret"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:35
 msgid "Preview:"
 msgstr "Podgl╠d:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:36
 msgid "Print using gray shading"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:37
 msgid "Reverse on even pages"
 msgstr "Odwrotnie na stronach parzystych"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Prawy:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:39
 msgid "Sections:"
 msgstr "Sekcje:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:40
 msgid "Shading"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:42
 msgid "Start on a new page"
 msgstr "Rozpoczynanie na nowej stronie"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:43
 msgid "Style name:"
 msgstr "Nazwa stylu:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:44
 msgid "Top:"
 msgstr "GСra:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:45
 msgid "Type:"
 msgstr "Typ:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/e-contact-print.glade.h:46
 msgid "Width:"
 msgstr "Szeroko╤Ф:"
 
-#: addressbook/printing/e-contact-print.glade.h:1
+#: po/tmp/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:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/print.c:1
+#: 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:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/print.c:1
+#: 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/cal-util/timeutil.c:1
-msgid "h"
-msgstr "h"
-
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
 msgid "Evolution Calendar Conduit"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit-control-applet.c:1
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "BЁ╠d przy komunikacji z serwerem terminarza"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1
-#: calendar/conduits/calendar/calendar-conduit.c:1
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: calendar/conduits/todo/todo-conduit-control-applet.c:127
 msgid "Evolution ToDo Conduit"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit-control-applet.c:1
+#: calendar/conduits/todo/todo-conduit-control-applet.c:130
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:1
-#: calendar/conduits/todo/todo-conduit.c:1
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:60
 msgid "Outline:"
 msgstr "Obrys:"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:61
 msgid "Headings:"
 msgstr "NagЁСwki:"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:62
 msgid "Empty days:"
 msgstr "Puste dni:"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:63
 msgid "Appointments:"
 msgstr "Terminy:"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:64
 msgid "Highlighted day:"
 msgstr "Pod╤wietlenie dnia"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:65
 msgid "Day numbers:"
 msgstr "Numery dni:"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:66
 msgid "Current day's number:"
 msgstr "Numer bie©╠cego dnia:"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is due today:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:69
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Nie odnaleziono pliku"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "OtwСrz terminarz"
 
-#: calendar/gui/calendar-commands.c:1
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Zapisz terminarz"
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:1 calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Publiczny"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Prywatny"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Tajny"
 
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:441
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:441
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:443
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:443
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:515
 msgid "Transparent"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:518
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1271,35 +1385,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:1 calendar/gui/calendar-model.c:1
-#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 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:1
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1309,907 +1423,944 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1
+#: calendar/gui/calendar-model.c:1033
 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:1
+#: calendar/gui/calendar-model.c:1073
 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/control-factory.c:1
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:1
+#: calendar/gui/dialogs/alarm-notify-dialog.c:183
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:1
+#: calendar/gui/dialogs/alarm-notify-dialog.c:190
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:1
+#: calendar/gui/dialogs/alarm-notify-dialog.c:201
 msgid "No summary available."
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: 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
 msgid "Close"
 msgstr "Zamknij"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Modyfikuj termin"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1 calendar/gui/gnome-cal.c:1
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
 msgid "Snooze"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:1
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 msgstr ""
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:6
+#, fuzzy
+msgid "05 minutes"
+msgstr "minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "10 minutes"
+msgstr "minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
 msgid "12 hour (am/pm)"
 msgstr "12-godzinny (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "15 minutes"
+msgstr "minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
 msgid "24 hour"
 msgstr "24-godzinny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:11
+#, fuzzy
+msgid "30 minutes"
+msgstr "minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "60 minutes"
+msgstr "minut"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
 msgid "Alarms timeout after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:14
 msgid "Audio Alarms"
 msgstr "Alarmy d╪wiЙkowe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:15
 msgid "Beep when alarm windows appear."
 msgstr "SygnaЁ d╪wiЙkowy przy pojawianiu siЙ okien alarmu."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:16
 msgid "Calendar"
 msgstr "Terminarz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:17
 msgid "Calendar Preferences"
 msgstr "Ustawienia termiarza"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:18
 msgid "Colors"
 msgstr "Kolory"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:19
 msgid "Compress weekends"
 msgstr "Kompresowanie weekendСw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr "Opcje wyboru daty"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:21
 msgid "Defaults"
 msgstr "Domy╤lne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Opcje wy╤wietlania"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Data wykonania"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:24
 msgid "Enable snoozing for"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:25
 msgid "End of day:"
 msgstr "Koniec dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:26
 msgid "First day of week:"
 msgstr "Pierwszy dzieЯ tygodnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/gnome-month-item.c:1
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
 msgid "Fri"
 msgstr "Pi╠"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "Pi╠tek"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
 msgid "Highlight"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:31
 msgid "Items Due Today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:32
 msgid "Items Not Yet Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/gnome-month-item.c:1
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
 msgid "Mon"
 msgstr "Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "PoniedziaЁek"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
 msgid "Overdue Items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:38
 msgid "Pick a color"
 msgstr "WybСr koloru"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1 filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Priorytet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:41
 msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/gnome-month-item.c:1
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
 msgid "Sat"
 msgstr "Sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Sobota"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
 msgid "Show"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:45
 msgid "Show appointment end times"
 msgstr "Wy╤wietlanie czasu koЯca terminu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:46
 msgid "Show week numbers"
 msgstr "Wy╤wietlanie numerСw tygodni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:47
 msgid "Start of day:"
 msgstr "Pocz╠tek dnia:"
 
 #. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/gnome-month-item.c:1
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
 msgid "Sun"
 msgstr "Nie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Niedziela"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/gnome-month-item.c:1
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
 msgid "Thu"
 msgstr "Czw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Czwartek"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
 msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:54
 msgid "Time divisions:"
 msgstr "PrzedziaЁy czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:55
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/gnome-month-item.c:1
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
 msgid "Tue"
 msgstr "Wto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "Wtorek"
+
+#: po/tmp/cal-prefs-dialog.glade.h:58
 msgid "Visual Alarms"
 msgstr "Alarmy wizualne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-#: calendar/gui/gnome-month-item.c:1
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
 msgid "Wed"
 msgstr "╕ro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "╕roda"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
 msgid "Work week"
 msgstr "TydzieЯ roboczy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:62
 msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
+#: po/tmp/cal-prefs-dialog.glade.h:63
 msgid "seconds."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:1
-msgid "Edit Task"
-msgstr "Modyfikuj zadanie"
-
-#: calendar/gui/dialogs/task-editor.c:1 calendar/gui/event-editor.c:1
-msgid "No summary"
-msgstr ""
-
-#: calendar/gui/dialogs/task-editor.c:1 calendar/gui/event-editor.c:1
-#, c-format
-msgid "Appointment - %s"
-msgstr "Termin - %s"
-
-#: calendar/gui/dialogs/task-editor.c:1 calendar/gui/event-editor.c:1
-#, c-format
-msgid "Task - %s"
-msgstr "Zadanie - %s"
-
-#: calendar/gui/dialogs/task-editor.c:1 calendar/gui/event-editor.c:1
-#, c-format
-msgid "Journal entry - %s"
-msgstr ""
-
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% _zakoЯczenia:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:7
 msgid "C_lassification:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:9
+#, fuzzy
+msgid "Cancelled"
+msgstr "Anuluj"
+
+#: po/tmp/task-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Completed"
+msgstr "% _zakoЯczenia:"
+
+#: po/tmp/task-editor-dialog.glade.h:12
 msgid "Date Completed:"
 msgstr "Data zakoЯczenia:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:14
+#, fuzzy
+msgid "High"
+msgstr "Wysoko╤Ф:"
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr ""
+
+#: po/tmp/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
+msgid "None"
+msgstr "Brak"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Not Started"
+msgstr "_Rozpoczynanie"
+
+#: po/tmp/task-editor-dialog.glade.h:22
 msgid "S_ummary"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:23
 msgid "Sta_rt Date:"
 msgstr "Czas _rozpoczЙcia:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Zadanie"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:26
 msgid "_Contacts..."
 msgstr "_Kontakty..."
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:27
 msgid "_Due Date:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Priority:"
 msgstr "_Priorytety:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Status:"
 msgstr "_Stan:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:1
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "task-editor-dialog"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Modyfikuj zadanie"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Termin - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Zadanie - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "OtwСrz..."
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Otwiera zadanie"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Oznacz jako zakoЯczone"
 
-#: calendar/gui/e-calendar-table.c:1
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Oznacza zadanie jako zakoЯczone"
 
-#: calendar/gui/e-calendar-table.c:1
-#: calendar/gui/event-editor-dialog.glade.h:1 filter/filter.glade.h:1
-#: filter/libfilter-i18n.h:1 mail/folder-browser.c:1
-#: mail/mail-config.glade.h:1 mail/mail-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-mail.xml.h:1
+#: 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:1
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Usuwa zadanie"
 
-#: calendar/gui/e-day-view-time-item.c:1
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: 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:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
+#: 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:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
+#: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: calendar/gui/e-week-view.c:1 calendar/gui/e-week-view.c:1
+#: 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
 msgid "New appointment..."
 msgstr "Nowy termin..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-day-view.c:1
-#: calendar/gui/e-week-view.c:1 calendar/gui/e-week-view.c:1
+#: 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
 msgid "Edit this appointment..."
 msgstr "Modyfikuj termin..."
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
-#: ui/evolution-event-editor.xml.h:1
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "UsuЯ termin"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "PrzeksztaЁФ ten termin w przesuwalny"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "UsuЯ to wyst╠pienie"
 
-#: calendar/gui/e-day-view.c:1 calendar/gui/e-week-view.c:1
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "UsuЯ wszystkie wyst╠pienia"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/e-week-view-main-item.c:1
+#: calendar/gui/e-week-view-main-item.c:342
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:1
-msgid "Edit Appointment"
-msgstr "Modyfikuj termin"
+#.
+#. * 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
+msgid "A_ll day event"
+msgstr "Wydarzenie _caЁodniowe"
 
-#: calendar/gui/event-editor.c:1
-msgid "on"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "Podstawowe elementy"
 
-#: calendar/gui/event-editor.c:1 calendar/gui/getdate.y:1
-#: filter/filter-datespec.c:1
-msgid "day"
-msgstr "dzieЯ"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "Klasyfikacja"
 
-#: calendar/gui/event-editor.c:1
-msgid "Monday"
-msgstr "PoniedziaЁek"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "Dowolna powtarzalno╤Ф"
 
-#: calendar/gui/event-editor.c:1
-msgid "Tuesday"
-msgstr "Wtorek"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Dni"
 
-#: calendar/gui/event-editor.c:1
-msgid "Wednesday"
-msgstr "╕roda"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1
-msgid "Thursday"
-msgstr "Czwartek"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Wyj╠tki"
 
-#: calendar/gui/event-editor.c:1
-msgid "Friday"
-msgstr "Pi╠tek"
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "Godziny"
 
-#: calendar/gui/event-editor.c:1
-msgid "Saturday"
-msgstr "Sobota"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "_Adresat listu:"
 
-#: calendar/gui/event-editor.c:1
-msgid "Sunday"
-msgstr "Niedziela"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minuty"
 
-#: calendar/gui/event-editor.c:1
-msgid "on the"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "ZmieЯ"
 
-#: calendar/gui/event-editor.c:1
-msgid "th"
-msgstr "."
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Brak powtarzalno╤ci"
 
-#: calendar/gui/event-editor.c:1
-msgid "occurrences"
-msgstr "powtСrzenia"
+#: po/tmp/event-editor-dialog.glade.h:21
+msgid "Preview"
+msgstr "Podgl╠d"
 
-#: calendar/gui/event-editor.c:1
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "P_rywatny"
 
-#: calendar/gui/event-editor.c:1 calendar/gui/print.c:1
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "Pu_bliczny"
 
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "event-editor-dialog"
-msgstr "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "Powtarzalno╤Ф"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr "ReguЁa powtarzalno╤ci"
+
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr "Przypominanie"
+
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr "Prosta powtarzalno╤Ф"
+
+#: po/tmp/event-editor-dialog.glade.h:28
 msgid "Su_mmary:"
 msgstr "Z_estawienie:"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: po/tmp/event-editor-dialog.glade.h:29
 msgid "Time"
 msgstr "Czas"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "_Start time:"
-msgstr "Czas _rozpoczЙcia:"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "_End time:"
-msgstr "Czas _zakoЯczenia"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "A_ll day event"
-msgstr "Wydarzenie _caЁodniowe"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Classification"
-msgstr "Klasyfikacja"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Pu_blic"
-msgstr "Pu_bliczny"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Pri_vate"
-msgstr "P_rywatny"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "_D╪wiЙk"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: po/tmp/event-editor-dialog.glade.h:31
 msgid "_Confidential"
 msgstr "_Tajny"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Minutes"
-msgstr "Minuty"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Hours"
-msgstr "Godziny"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Days"
-msgstr "Dni"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: po/tmp/event-editor-dialog.glade.h:32
 msgid "_Display"
 msgstr "_Wy╤wietlanie"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "_Program"
-msgstr "_Program"
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "Czas _zakoЯczenia"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: po/tmp/event-editor-dialog.glade.h:34
 msgid "_Mail"
 msgstr "_List"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Mail _to:"
-msgstr "_Adresat listu:"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Program"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: po/tmp/event-editor-dialog.glade.h:36
 msgid "_Run program:"
 msgstr "U_ruchomiany program:"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "_Audio"
-msgstr "_D╪wiЙk"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Reminder"
-msgstr "Przypominanie"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Appointment Basics"
-msgstr "Podstawowe elementy"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "Czas _rozpoczЙcia:"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Czas _rozpoczЙcia:"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Recurrence Rule"
-msgstr "ReguЁa powtarzalno╤ci"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "No recurrence"
-msgstr "Brak powtarzalno╤ci"
-
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Simple recurrence"
-msgstr "Prosta powtarzalno╤Ф"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "dzieЯ/dni"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Custom recurrence"
-msgstr "Dowolna powtarzalno╤Ф"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "event-editor-dialog"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Every"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "day(s)"
-msgstr "dzieЯ/dni"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "week(s)"
-msgstr "tygodni"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "etykieta21"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: po/tmp/event-editor-dialog.glade.h:44
 msgid "month(s)"
 msgstr "miesiЙcy"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
+msgstr "tygodni"
+
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "lat"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "for"
-msgstr ""
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Modyfikuj termin"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "until"
+#: calendar/gui/event-editor.c:407
+msgid "on"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "forever"
-msgstr ""
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dzieЯ"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Exceptions"
-msgstr "Wyj╠tki"
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Modify"
-msgstr "ZmieЯ"
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr "."
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "label21"
-msgstr "etykieta21"
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "powtСrzenia"
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Preview"
-msgstr "Podgl╠d"
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:1
-msgid "Recurrence"
-msgstr "Powtarzalno╤Ф"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "styczeЯ"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:392
 msgid "february"
 msgstr "luty"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:393
 msgid "march"
 msgstr "marzec"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:394
 msgid "april"
 msgstr "kwiecieЯ"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:395
 msgid "may"
 msgstr "maj"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:396
 msgid "june"
 msgstr "czerwiec"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:397
 msgid "july"
 msgstr "lipiec"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:398
 msgid "august"
 msgstr "sierpieЯ"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:399
 msgid "september"
 msgstr "wrzesieЯ"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:400
 msgid "sept"
 msgstr "wrz"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:401
 msgid "october"
 msgstr "pa╪dziernik"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:402
 msgid "november"
 msgstr "listopad"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:403
 msgid "december"
 msgstr "grudzieЯ"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:404
 msgid "sunday"
 msgstr "niedziela"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:405
 msgid "monday"
 msgstr "poniedziaЁek"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:406
 msgid "tuesday"
 msgstr "wtorek"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:407
 msgid "tues"
 msgstr "wto"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:408
 msgid "wednesday"
 msgstr "╤roda"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:409
 msgid "wednes"
 msgstr "╤ro"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:410
 msgid "thursday"
 msgstr "czwartek"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:411
 msgid "thur"
 msgstr "czw"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:412
 msgid "thurs"
 msgstr "czw"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:413
 msgid "friday"
 msgstr "pi╠tek"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:414
 msgid "saturday"
 msgstr "sobota"
 
-#: calendar/gui/getdate.y:1 filter/filter-datespec.c:1
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "rok"
 
-#: calendar/gui/getdate.y:1 filter/filter-datespec.c:1
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "miesi╠c"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:422
 msgid "fortnight"
 msgstr "dwa tygodnie"
 
-#: calendar/gui/getdate.y:1 filter/filter-datespec.c:1
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "tydzieЯ"
 
-#: calendar/gui/getdate.y:1 filter/filter-datespec.c:1
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "godzina"
 
-#: calendar/gui/getdate.y:1 filter/filter-datespec.c:1
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "minuta"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:427
 msgid "min"
 msgstr "min"
 
-#: calendar/gui/getdate.y:1 filter/filter-datespec.c:1
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "sekunda"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:429
 msgid "sec"
 msgstr "sek"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:435
 msgid "tomorrow"
 msgstr "jutro"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:436
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:437
 msgid "today"
 msgstr "dzi╤"
 
-#: calendar/gui/getdate.y:1 filter/filter-datespec.c:1
-#: filter/filter-datespec.c:1
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "teraz"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:439
 msgid "last"
 msgstr "ostatni"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:440
 msgid "this"
 msgstr "ten"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:441
 msgid "next"
 msgstr "nastЙpny"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:442
 msgid "first"
 msgstr "pierwszy"
 
 #. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:444
 msgid "third"
 msgstr "trzeci"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:445
 msgid "fourth"
 msgstr "czwarty"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:446
 msgid "fifth"
 msgstr "pi╠ty"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:447
 msgid "sixth"
 msgstr "szСsty"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:448
 msgid "seventh"
 msgstr "siСdmy"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:449
 msgid "eighth"
 msgstr "Сsmy"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:450
 msgid "ninth"
 msgstr "dziewi╠ty"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:451
 msgid "tenth"
 msgstr "dziesi╠ty"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:452
 msgid "eleventh"
 msgstr "jedenasty"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:453
 msgid "twelfth"
 msgstr "dwunasty"
 
-#: calendar/gui/getdate.y:1
+#: calendar/gui/getdate.y:454
 msgid "ago"
 msgstr "temu"
 
-#: calendar/gui/gnome-cal.c:1 calendar/gui/gnome-cal.c:1
-#: calendar/gui/gnome-cal.c:1
+#: 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/gnome-cal.c:1
+#: 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/gnome-cal.c:1
+#: 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/gnome-cal.c:1
+#: 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:1 calendar/gui/gnome-cal.c:1
-#: mail/mail-search-dialogue.c:1
+#: 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:1
+#: calendar/gui/goto.c:82
 msgid "Year:"
 msgstr "Rok:"
 
-#: calendar/gui/goto.c:1
+#: calendar/gui/goto.c:270
 msgid "Go to date"
 msgstr "Przejd╪ do daty:"
 
 #. Instructions
-#: calendar/gui/goto.c:1
+#: 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"
@@ -2219,336 +2370,352 @@ msgstr ""
 "KlikniЙcie na dniu spowoduje przej╤cie\n"
 "do wybranego dnia."
 
-#: calendar/gui/goto.c:1
+#: calendar/gui/goto.c:318
 msgid "Go to today"
 msgstr "Przejd╪ do dnia dzisiejszego"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:288
 msgid "1st"
 msgstr "1."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:288
 msgid "2nd"
 msgstr "2."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:288
 msgid "3rd"
 msgstr "3."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:288
 msgid "4th"
 msgstr "4."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:288
 msgid "5th"
 msgstr "5."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:289
 msgid "7th"
 msgstr "7."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:289
 msgid "8th"
 msgstr "8."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:289
 msgid "9th"
 msgstr "9."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:289
 msgid "10th"
 msgstr "10."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:290
 msgid "11th"
 msgstr "11."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:290
 msgid "12th"
 msgstr "12."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:290
 msgid "13th"
 msgstr "13."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:290
 msgid "14th"
 msgstr "14."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:290
 msgid "15th"
 msgstr "15."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:291
 msgid "16th"
 msgstr "16."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:291
 msgid "17th"
 msgstr "17."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:291
 msgid "18th"
 msgstr "18."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:291
 msgid "19th"
 msgstr "19."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:291
 msgid "20th"
 msgstr "20."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:292
 msgid "21st"
 msgstr "21."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:292
 msgid "22nd"
 msgstr "22."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:292
 msgid "23rd"
 msgstr "23."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:292
 msgid "24th"
 msgstr "24."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:292
 msgid "25th"
 msgstr "25."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:293
 msgid "26th"
 msgstr "26."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:293
 msgid "27th"
 msgstr "27."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:293
 msgid "28th"
 msgstr "28."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:293
 msgid "29th"
 msgstr "29."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:293
 msgid "30th"
 msgstr "30."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:294
 msgid "31st"
 msgstr "31."
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:350
 msgid "Su"
 msgstr "Ni"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:350
 msgid "Mo"
 msgstr "Po"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:350
 msgid "Tu"
 msgstr "Wt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:350
 msgid "We"
 msgstr "╕r"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:350
 msgid "Th"
 msgstr "Cz"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:350
 msgid "Fr"
 msgstr "Pt"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:350
 msgid "Sa"
 msgstr "So"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:936
 msgid "Tasks"
 msgstr "Zadania"
 
 #. Day
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1066
 msgid "Current day (%a %b %d %Y)"
 msgstr "Bie©╠cy dzieЯ (%a %b %d %Y)"
 
-#: calendar/gui/print.c:1 calendar/gui/print.c:1
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1081
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1092
 #, c-format
 msgid "Current week (%s - %s)"
 msgstr "Bie©╠cy tydzieЯ (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1100
 msgid "Current month (%b %Y)"
 msgstr "Bie©╠cy miesi╠Ф (%b %Y)"
 
 #. Year
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1107
 msgid "Current year (%Y)"
 msgstr "Bie©╠cy rok (%Y)"
 
-#: calendar/gui/print.c:1
+#: calendar/gui/print.c:1144
 msgid "Print Calendar"
 msgstr "Drukuj terminarz"
 
-#: calendar/gui/print.c:1 mail/mail-callbacks.c:1
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 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:1 widgets/misc/e-calendar-item.c:1
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr ""
 
-#: calendar/gui/weekday-picker.c:1 calendar/gui/weekday-picker.c:1
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr ""
 
-#: camel/camel-movemail.c:1
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Nie mo©na sprawdziФ pliku z listami %s: %s"
-
-#: camel/camel-movemail.c:1 camel/camel-movemail.c:1
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nie mo©na utworzuФ pliku blokady dla %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Nie mo©na sprawdziФ pliku z listami %s: %s"
+
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nie mo©na otworzyФ pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nie mo©na otworzyФ tymczasowego pliku z listami %s: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:1
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "BЁ╠d przy odczycie pliku z listem: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "BЁ╠d przy zapisie do tymczasowego pliku z listami: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Zapisanie listu w pliku tymczasowym %s nie powiodЁo siЙ: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Utworzenie potoku nie powiodЁo siЙ: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nie mo©na utworzyФ procesu: %s"
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:1
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Nieznany bЁ╠d)"
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:133
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Nie mo©na wczytaФ %s: %s"
 
-#: camel/camel-provider.c:1
+#: camel/camel-provider.c:141
 #, c-format
 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:1
+#: camel/camel-remote-store.c:182
 #, c-format
 msgid "%s server %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:1
+#: camel/camel-remote-store.c:227
 #, 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:1
+#: camel/camel-remote-store.c:228
 msgid "(unknown host)"
 msgstr "(nieznany komputer)"
 
-#: camel/camel-service.c:1
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa u©ytkownika"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:129
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "W URL-u \"%s\" wymagana jest nazwa komputera"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "W URL-u \"%s\" wymagana jest ╤cie©ka"
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr "Nie ma komputera o nazwie %s."
 
-#: camel/camel-service.c:1
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Brak dostarczyciela dla protokoЁu \"%s\""
 
-#: camel/camel-session.c:1
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2557,91 +2724,107 @@ msgstr ""
 "Nie mo©na utworzyФ katalogu %s:\n"
 "%s"
 
-#: camel/camel-url.c:1
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL \"%s\" nie zawiera nazwy protokoЁu"
 
-#: camel/camel-url.c:1
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL \"%s\" nie zawiera niepoprawn╠ nazwЙ protokoЁu"
 
-#: camel/camel-url.c:1
+#: camel/camel-url.c:154
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Numer portu w URL-u \"%s\" nie jest numeryczny"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-auth.c:127
+#, 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
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Nieoczekiwana odpowied╪ od serwera IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Nieoczekiwana odpowied╪ od serwera IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:224
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "Nie powiodЁo siЙ polecenie IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:1 shell/e-storage.c:1
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Nieznany bЁ╠d"
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:1
+#: camel/providers/imap/camel-imap-command.c:443
 #, 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:1
+#: camel/providers/imap/camel-imap-folder.c:216
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Nie mo©na odnale╪Ф tre╤ci listu w odpowiedzi na FETCH."
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:39
 msgid "IMAPv4"
 msgstr "IMAPv4"
 
-#: camel/providers/imap/camel-imap-provider.c:1
+#: camel/providers/imap/camel-imap-provider.c:41
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: 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:1
+#: camel/providers/imap/camel-imap-store.c:236
 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:1
+#: camel/providers/imap/camel-imap-store.c:245
 msgid "Kerberos 4"
 msgstr "Kerberos 4"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:247
 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:1
+#: camel/providers/imap/camel-imap-store.c:333
 #, 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:1
+#: camel/providers/imap/camel-imap-store.c:359
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2652,53 +2835,204 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1
+#: camel/providers/imap/camel-imap-store.c:539
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Nie mo©na utworzyФ katalogu %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:1
-msgid "Could not create summary"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:1
-#: camel/providers/mbox/camel-mbox-folder.c:1
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:47
+#, fuzzy
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "Pliki z listami w uniksowym formacie mbox"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Nie mo©na doЁ╠czyФ listu do pliku mbox: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "\"%s\" nie jest zwykЁym plikiem."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Nie mo©na utworzyФ procesu dla %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:1
+#: camel/providers/local/camel-local-store.c:186
+#, fuzzy
+msgid "Local folders may not be nested."
+msgstr "Foldery mbox nie mog╠ byФ zagnie©d©one."
+
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Nie mo©na pobraФ listu: %s"
+msgid "Local mail file %s"
+msgstr "Lokalny plik z listami %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:1
-msgid "UNIX mbox-format mail files"
-msgstr "Pliki z listami w uniksowym formacie mbox"
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Nie mo©na zmieniФ nazwy foldera \"%s\": %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:1
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Nie mo©na usun╠Ф foldera \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Nie mo©na usun╠Ф foldera \"%s\": %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
+"Nie mo©na pobraФ listu: %s\n"
+"  %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:1
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+#, fuzzy
+msgid "Invalid message contents"
+msgstr "Wy╤lij _list do kontaktu..."
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Nie mo©na otworzyФ pliku \"%s\":\n"
+"Nie mo©na otworzyФ foldera \"%s\":\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:1
-#: camel/providers/mh/camel-mh-store.c:1
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Folder \"%s\" nie istnieje."
 
-#: camel/providers/mbox/camel-mbox-store.c:1
+# y, c-format
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nie mo©na utworzyФ foldera \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "\"%s\" nie jest katalogiem."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Nie mo©na usun╠Ф foldera \"%s\": %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Lokalny katalog z listami %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Nie mo©na pobraФ listu: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Nie mo©na otworzyФ pliku \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2707,14 +3041,14 @@ msgstr ""
 "Nie mo©na utworzyФ pliku \"%s\":\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:1
-#: camel/providers/mbox/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" nie jest zwykЁym plikiem."
 
-#: camel/providers/mbox/camel-mbox-store.c:1
-#: camel/providers/mbox/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2723,278 +3057,213 @@ msgstr ""
 "Nie mo©na usun╠Ф foldera \"%s\":\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Folder \"%s\" nie jest pusty. Nie zostaЁ usuniЙty."
 
-#: camel/providers/mbox/camel-mbox-store.c:1
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Nie mo©na otworzyФ foldera: spis listСw byЁ niekompletny."
+
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
-"Nie mo©na zmieniФ nazwy foldera %s na %s: folder o nazwie docelowej istnieje"
-
-#: camel/providers/mbox/camel-mbox-store.c:1
-msgid "Mbox folders may not be nested."
-msgstr "Foldery mbox nie mog╠ byФ zagnie©d©one."
 
-#: camel/providers/mbox/camel-mbox-store.c:1
-#, c-format
-msgid "Local mail file %s"
-msgstr "Lokalny plik z listami %s"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Nie mo©na utworzyФ procesu dla %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:1
-#, c-format
-msgid "Could not open summary %s"
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
+"Nie mo©na otworzyФ foldera \"%s\":\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nie mo©na otworzyФ tymczasowej skrzynki: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:1
-msgid "Summary mismatch, aborting sync"
+#: 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
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:1
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr ""
-
-#: camel/providers/mbox/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:1
-#: camel/providers/mbox/camel-mbox-summary.c:1
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Nie mo©na skopiowaФ danych do pliku wyj╤ciowego: %s"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Nie mo©na otworzyФ pliku z listami %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nie mo©na zamkn╠Ф foldera ╪rСdЁowego %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nie mo©na zamkn╠Ф foldera tymczasowego: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nie mo©na zmieniФ nazwy foldera: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:1
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Nieznany bЁ╠d: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:1
-msgid "Could not load or create summary"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-folder.c:1
-#: camel/providers/mh/camel-mh-folder.c:1
-#, c-format
-msgid "Cannot append message to mh folder: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Nie mo©na doЁ╠czyФ listu do foldera mh: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:1
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Nie mo©na pobraФ listu: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:1
-msgid "UNIX MH-format mail directories"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-provider.c:1
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-store.c:1
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nie mo©na otworzyФ foldera \"%s\":\n"
-"%s"
-
-# y, c-format
-#: camel/providers/mh/camel-mh-store.c:1
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nie mo©na utworzyФ foldera \"%s\":\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:1
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" nie jest katalogiem."
 
-#: camel/providers/mh/camel-mh-store.c:1
-#: camel/providers/mh/camel-mh-store.c:1
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Nie mo©na usun╠Ф foldera \"%s\": %s"
-
-#: camel/providers/mh/camel-mh-store.c:1
-#: camel/providers/mh/camel-mh-store.c:1
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Nie mo©na zmieniФ nazwy foldera \"%s\": %s"
-
-#: camel/providers/mh/camel-mh-store.c:1
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Nie mo©na zmieniФ nazwy foldera \"%s\": %s istnieje"
-
-#: camel/providers/mh/camel-mh-store.c:1
-msgid "MH folders may not be nested."
-msgstr "Foldery MH nie mog╠ byФ zagnie©d©one"
-
-#: camel/providers/mh/camel-mh-store.c:1
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Lokalny katalog z listami %s"
-
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
 msgstr "Wprowad╪ hasЁo NNTP dla %s@%s"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:62
 msgid "Server rejected username"
 msgstr "Swerwer odrzuciЁ nazwЙ u©ytkownika"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:68
 msgid "Failed to send username to server"
 msgstr "WysЁanie nazwy u©ytkownika do serwera nie powiodЁo siЙ"
 
-#: camel/providers/nntp/camel-nntp-auth.c:1
+#: camel/providers/nntp/camel-nntp-auth.c:77
 msgid "Server rejected username/password"
 msgstr "Serwer odrzuciЁ nazwЙ u©ytkownika/hasЁo"
 
-#: camel/providers/nntp/camel-nntp-folder.c:1
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Nie odnaleziono listu %s."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
 msgid "Could not get group list from server."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:1
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: camel/providers/nntp/camel-nntp-provider.c:38
 msgid "USENET news"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-provider.c:1
+#: 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:1
+#: camel/providers/nntp/camel-nntp-store.c:226
 #, c-format
 msgid "Could not open directory for news server: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:288
 #, c-format
 msgid "USENET News via %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:295
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:1
-#: camel/providers/nntp/camel-nntp-store.c:1
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
 #, c-format
 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:1
+#: camel/providers/pop3/camel-pop3-folder.c:179
 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:1
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr "Brak listu o warto╤ci uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:1
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nie mo©na pobraФ listu z serwera POP %s: %s"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:34
 msgid "POP"
 msgstr "POP"
 
-#: camel/providers/pop3/camel-pop3-provider.c:1
+#: camel/providers/pop3/camel-pop3-provider.c:36
 msgid ""
 "For connecting to POP servers. The POP protocol can also be used to retrieve "
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:150
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:160
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:172
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 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:1
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, 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:1
+#: camel/providers/pop3/camel-pop3-store.c:389
 #, 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:1
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3003,18 +3272,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:1
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:411
+#: camel/providers/pop3/camel-pop3-store.c:448
 msgid "(Unknown)"
 msgstr "(Nieznane)"
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:438
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:1
+#: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
@@ -3023,234 +3292,233 @@ 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:1
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Folder \"%s\" nie istnieje."
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-provider.c:1
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr ""
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr ""
 "Nie mo©na utworzyФ potoku do programu sendmail: %s: poczta nie zostaЁa "
 "wysЁana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr ""
 "Nie mo©na utworzyФ procesu dla programu sendmail: %s: poczta nie zostaЁa "
 "wysЁana"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Nie mo©na wysЁaФ listu: %s"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr ""
 "Program sendmail zostaЁ przerwany przez sygnaЁ %s: poczta nie zostaЁa "
 "wysЁana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Nie mo©na wykonaФ %s: poczta nie zostaЁa wysЁana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr ""
 "Program sendmail zostaЁ zakoЯczony z kodem stanu %d: poczta nie zostaЁa "
 "wysЁana."
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
 msgid "sendmail"
 msgstr "sendmail"
 
-#: camel/providers/sendmail/camel-sendmail-transport.c:1
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
 msgid "Mail delivery via the sendmail program"
 msgstr "WysyЁanie listСw za pomoc╠ programu sendmail"
 
-#: camel/providers/smtp/camel-smtp-provider.c:1
+#: camel/providers/smtp/camel-smtp-provider.c:36
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:1
+#: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
 msgstr ""
 
-#: camel/providers/vee/camel-vee-provider.c:1
+#: camel/providers/vee/camel-vee-provider.c:32
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtСw"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fk"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:1 mail/mail-display.c:1
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "zaЁ╠cznik"
 
-#: composer/e-msg-composer-attachment-bar.c:1
-#: ui/evolution-message-composer.xml.h:1
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "ZaЁ╠czenie pliku"
 
-#: composer/e-msg-composer-attachment-bar.c:1 filter/filter.glade.h:1
-#: shell/e-shortcuts-view.c:1 shell/e-shortcuts-view.c:1
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/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:1
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Usuwa wybrane elementy z listy zaЁ╠cznikСw"
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Dodaj zaЁ╠cznik..."
 
-#: composer/e-msg-composer-attachment-bar.c:1
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "ZaЁ╠cza plik do listu"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:1
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "WЁa╤ciwo╤ci zaЁ╠cznika"
 
-#: composer/e-msg-composer-attachment.glade.h:1
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Nazwa pliku:"
 
-#: composer/e-msg-composer-attachment.glade.h:1
+#: po/tmp/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "Typ MIME:"
 
-#: composer/e-msg-composer-hdrs.c:1 composer/e-msg-composer-hdrs.c:1
-#: mail/mail-format.c:1
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:621
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Kliknij tu aby otworzyФ ksi╠©kЙ adresow╠"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:291
 msgid "Enter the identity you wish to send this message from"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:1 mail/mail-format.c:1
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Dla:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Podaj adres odbiorcy listu"
 
-#: composer/e-msg-composer-hdrs.c:1 mail/mail-format.c:1
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:301
 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:1
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:307
 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:1 mail/mail-format.c:1
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Temat:"
 
-#: composer/e-msg-composer-hdrs.c:1
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Podaj temat listu"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
 "%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "BЁ╠d przy zapisie pliku: %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "BЁ╠d przy odczycie pliku : %s"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Zapisywanie zmian listu..."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Zapisz zmiany listu..."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:1 shell/e-shell-view-menu.c:1
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3260,29 +3528,29 @@ msgstr ""
 "\n"
 "Czy chcesz zapisaФ zmiany?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Otwiera plik"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Podany plik nie istnieje."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Podany plik nie jest zwykЁym plikiem."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Podany plik istnieje, lecz nie mo©na go odczytaФ."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:923
 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:1
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3290,63 +3558,63 @@ msgstr ""
 "Plik jest bardzo du©y (wiЙkszy ni© 100K).\n"
 "Czy na pewno chcesz go wstawiФ?"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Podczas odczytu pliku wyst╠piЁ bЁ╠d."
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Tworzenie listu"
 
-#: composer/e-msg-composer.c:1
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr ""
 
-#: composer/evolution-composer.c:1
+#: composer/evolution-composer.c:307
 msgid "Cannot initialize Evolution's composer."
 msgstr ""
 
-#: filter/e-search-bar.c:1
+#: filter/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "_Wyszukiwanie"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "lat"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "miesiЙcy"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "tygodni"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:65
 msgid "days"
 msgstr "dni"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "godzin"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minut"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "sekund"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:183
 msgid "Oops. You have forgotten to choose a date."
 msgstr ""
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:185
 msgid "Oops. You have chosen an invalid date."
 msgstr ""
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
@@ -3355,7 +3623,7 @@ msgstr ""
 "Data listu bЙdzie porСwnywana z czasem\n"
 "zastosowania filtra."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
@@ -3363,7 +3631,7 @@ msgstr ""
 "Data listu bЙdzie porСwnywana z czasem podanym\n"
 "poni©ej."
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3374,72 +3642,81 @@ msgstr ""
 "\"tydzieЯ temu\"."
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr "bie©╠cym czasem"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr "podanym czasem"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr "czasem podanym wzglЙdem bie©╠cego"
 
 #. The label
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr "PorСwnanie z"
 
-#: filter/filter-datespec.c:1
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<kliknij, aby wybraФ datЙ>"
 
-#: filter/filter-editor.c:1 mail/mail-autofilter.c:1
-#: mail/mail-autofilter.c:1
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Dodanie reguЁy filtra"
 
-#: filter/filter-editor.c:1
+#: filter/filter-editor.c:233
 msgid "Edit Filter Rule"
 msgstr "Zmodyfikuj reguЁЙ filtra"
 
-#: filter/filter-editor.c:1 filter/filter.glade.h:1
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr ""
 
 #. and now for the action area
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:401
 msgid "Then"
 msgstr "Podejmowane czynno╤ci"
 
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:414
 msgid "Add action"
 msgstr "Dodaj czynno╤Ф"
 
-#: filter/filter-filter.c:1
+#: filter/filter-filter.c:420
 msgid "Remove action"
 msgstr "UsuЯ czynno╤Ф"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:143
 msgid ""
 "Oops, you forgot to choose a folder.\n"
 "Please go back and specify a valid folder to deliver mail to."
 msgstr ""
 
-#: filter/filter-folder.c:1 filter/vfolder-rule.c:1
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "WybСr foldera"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Wprowad╪ URI foldera"
 
-#: filter/filter-folder.c:1
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<kliknij, aby wybraФ folder> "
 
-#: filter/filter-input.c:1
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3448,415 +3725,415 @@ msgstr ""
 "BЁ╠d w wyra©eniu regularnym \"%s\":\n"
 "%s"
 
-#: filter/filter-part.c:1
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr ""
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:520
 msgid "Rule name: "
 msgstr "Nazwa reguЁy: "
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:524
 msgid "Untitled"
 msgstr "Bez nazwy"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "Lista warunkСw"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Wykonywanie czynno╤ci"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "przy speЁnieniu wszystkich kryteriСw"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "przy speЁnieniu ktСregokolwiek z kryteriСw"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Dodaj kryterium"
 
-#: filter/filter-rule.c:1
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "UsuЯ kryterium"
 
-#: filter/filter.glade.h:1 mail/folder-browser.c:1
-#: mail/mail-config.glade.h:1
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Edycja"
 
-#: filter/filter.glade.h:1
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Modyfikacja VFolderСw"
 
-#: filter/filter.glade.h:1
+#: po/tmp/filter.glade.h:11
 msgid "Filter Rules"
 msgstr "ReguЁy filtrСw"
 
-#: filter/filter.glade.h:1
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "Obrys:"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Wirtualne foldery"
 
-#: filter/filter.glade.h:1
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "╛rСdЁa VFolderСw"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:1 mail/message-list.c:1
-msgid "Answered"
-msgstr ""
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Przypisz kolor"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopiuj do foldera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Data otrzymania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Data wysЁania"
 
-#: filter/libfilter-i18n.h:1
-msgid "Deleted"
-msgstr "UsuniЙty"
-
-#: filter/libfilter-i18n.h:1
-msgid "Draft"
-msgstr "Roboczy"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "Wyra©enie"
 
-#: filter/libfilter-i18n.h:1
-msgid "Flagged"
-msgstr "Oznaczony"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "Prze╤lij na adres"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Tre╤Ф listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:11
 msgid "Message Header"
 msgstr "NagЁСwek listu"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "List zostaЁ otrzymany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "List zostaЁ wysЁany"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Przenie╤ do foldera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Lista odbiorcСw"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:17
 msgid "Regex Match"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1 mail/message-list.c:1
-msgid "Seen"
-msgstr "Widziany"
-
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Nadawca"
 
-#: filter/libfilter-i18n.h:1
-msgid "Set Flag"
-msgstr "Oznacz"
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "_Stan:"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "╛rСdЁo"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "Okre╤lony nagЁСwek"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "_Stan:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Temat"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "po"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "przed"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "zawiera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "nie koЯczy siЙ na"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "nie istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "nie rozpoczyna siЙ od"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "koЯczy siЙ na"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "istnieje"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "jest wiЙkszy ni©"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "jest mniejszy ni©"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "nie jest"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "jest"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "w lub po"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "w lub przed"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr ""
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "jest po"
 
-#: filter/libfilter-i18n.h:1
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "jest przed"
 
-#: filter/score-editor.c:1
+#: filter/score-editor.c:127
 msgid "Add Rule"
 msgstr "Dodaj reguЁЙ"
 
-#: filter/score-editor.c:1
+#: filter/score-editor.c:166
 msgid "Edit Score Rule"
 msgstr ""
 
-#: filter/score-rule.c:1 filter/score-rule.c:1
+#: filter/score-rule.c:192 filter/score-rule.c:194
 msgid "Score"
 msgstr ""
 
-#: filter/vfolder-editor.c:1
+#: filter/vfolder-editor.c:155
 msgid "Add VFolder Rule"
 msgstr "Dodaj reguЁЙ VFoldera"
 
-#: filter/vfolder-editor.c:1
+#: filter/vfolder-editor.c:204
 msgid "Edit VFolder Rule"
 msgstr "Zmodyfikuj reguЁЙ VFoldera"
 
-#: mail/component-factory.c:1
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Nie mo©na zainicjowaФ komponentu pocztowego Evlution."
 
-#: mail/component-factory.c:1
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr ""
-
-#: mail/component-factory.c:1
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr ""
-
-#: mail/component-factory.c:1
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Zapisz"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "Tre╤Ф lub temat zawiera"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Tre╤Ф zawiera"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Temat zawiera"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Tre╤Ф nie zawiera"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Temat nie zawiera"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:453
 msgid "VFolder on Subject"
 msgstr "UtwСrz VFolder w oparciu o temat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:454
 msgid "VFolder on Sender"
 msgstr "UtwСrz VFolder w oparciu o nadawcЙ"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:455
 msgid "VFolder on Recipients"
 msgstr "UtwСrz VFolder w oparciu o odbiorcСw"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:457
 msgid "Filter on Subject"
 msgstr "UtwСrz filtr w oparciu o temat"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:458
 msgid "Filter on Sender"
 msgstr "UtwСrz filtr w oparciu o nadawcЙ"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:459
 msgid "Filter on Recipients"
 msgstr "UtwСrz filtr w oparciu o odbiorcСw"
 
-#: mail/folder-browser.c:1 mail/folder-browser.c:1
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
 msgid "Filter on Mailing List"
 msgstr "UtwСrz filtr w oparciu o listЙ dyskusyjn╠"
 
-#: mail/folder-browser.c:1 ui/evolution-message-composer.xml.h:1
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "OtwСrz"
 
-#: mail/folder-browser.c:1 mail/mail-view.c:1
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:466
+#, 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
 msgid "Print"
 msgstr "Drukuj"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Odpowiedz nadawcy"
 
-#: mail/folder-browser.c:1 mail/mail-view.c:1 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Wszystkim"
 
-#: mail/folder-browser.c:1 mail/mail-view.c:1 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Prze╤lij"
 
-#: mail/folder-browser.c:1 ui/evolution-mail.xml.h:1
-msgid "Forward as Attachment"
-msgstr "Prze╤lij jako zaЁ╠cznik"
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Przemieszcza w czasie do przodu"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "Oznacz jako przeczytany"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "Oznacz jako nieprzeczytany"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:477
 msgid "Move to Folder..."
 msgstr "Przenie╤ do foldera..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:478
 msgid "Copy to Folder..."
 msgstr "Kopiuj do foldera..."
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:480
 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:1
+#: mail/folder-browser.c:484
 msgid "Apply Filters"
 msgstr "Zastosuj filtry"
 
-#: mail/folder-browser.c:1 ui/evolution-mail.xml.h:1
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "UtwСrz reguЁЙ na podstawie listu"
 
-#: mail/folder-browser.c:1
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "UtwСrz filtr w oparciu o listЙ dyskusyjn╠ (%s)"
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:214
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:1
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3864,31 +4141,31 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:1 mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
 msgid "You have no mail sources configured"
 msgstr "Nie skonfigurowano ©adnych ╪rСdeЁ listСw"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:213
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:222
 msgid "You have no Outbox configured"
 msgstr "Nie zostaЁ skonfigurowany folder Poczta wychodz╠ca"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -3896,19 +4173,19 @@ msgstr ""
 "List nie zawiera tematu.\n"
 "NaprawdЙ wysЁaФ?"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:291
 msgid "You must specify recipients in order to send this message."
 msgstr ""
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Przenoszenie listСw do foldera"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Kopiowanie listСw do foldera"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -3916,7 +4193,29 @@ msgstr ""
 "Mo©liwe jest redagowanie wyЁ╠cznie\n"
 "listСw zapisanych w folderze Poczta robocza."
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "NadpisaФ plik?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Plik o tej nazwie ju© istnieje.\n"
+"NadpisaФ go?"
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Zapisz jako..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Zapisz jako..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -3925,74 +4224,110 @@ msgstr ""
 "BЁ╠d przy wczytywaniu informacji o filtrze:\n"
 "%s"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Wydrukuj list"
 
-#: mail/mail-callbacks.c:1
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Wydrukowanie listu nie powiodЁo siЙ"
 
-#: mail/mail-config-gui.c:1
+#.
+#. * 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
+msgid "Identity"
+msgstr "Dane osobowe"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "Konfiguracja poczty"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "╛rСdЁo listСw"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+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."
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "PeЁna nazwa:"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Adres e-mail:"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organizacja:"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Plik z podpisem:"
 
-#: mail/mail-config-gui.c:1 mail/mail-config.glade.h:1
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Plik z podpisem"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Serwer:"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "nazwa u©ytkownika:"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "╕cie©ka:"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Uwierzytelnianie:"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Wykryj obsЁugiwane typy..."
 
-#: mail/mail-config-gui.c:1
+#: 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"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Przetestuj ustawienia"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Typ ╪rСdЁa listСw:"
 
-#: mail/mail-config-gui.c:1 mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4001,11 +4336,11 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4014,177 +4349,112 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Dodaj ╪rСdЁo"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Zmodyfikuj ╪rСdЁo"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Testowanie \"%s\""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "PoЁ╠czenie zakoЯczyЁo siЙ powodzeniem!"
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:1
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 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.
-#.
-#: mail/mail-config-druid.glade.h:1 mail/mail-config-druid.glade.h:1
-#: mail/mail-config-druid.glade.h:1
-msgid "Mail Configuration"
-msgstr "Konfiguracja poczty"
-
-#: mail/mail-config-druid.glade.h:1
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:1
-msgid "Identity"
-msgstr "Dane osobowe"
-
-#: mail/mail-config-druid.glade.h:1
-msgid "Mail Source"
-msgstr "╛rСdЁo listСw"
-
-#: mail/mail-config-druid.glade.h:1 mail/mail-config.glade.h:1
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:1
-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."
-
-#: mail/mail-config.glade.h:1
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adres"
 
-#: mail/mail-config.glade.h:1
+#: po/tmp/mail-config.glade.h:10
 msgid "Identities"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "╛rСdЁa listСw"
 
-#: mail/mail-config.glade.h:1
+#: po/tmp/mail-config.glade.h:13
 msgid "Mark message as seen [ms]: "
 msgstr "OpС╪nienie oznaczania listu jako widzianego [ms]: "
 
-#: mail/mail-config.glade.h:1
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr ""
 
-#: mail/mail-config.glade.h:1
+#: po/tmp/mail-config.glade.h:16
 msgid "Organization"
 msgstr "Organizacja"
 
-#: mail/mail-config.glade.h:1
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "WysyЁanie listСw w formacie HTML"
 
-#: mail/mail-config.glade.h:1
+#: po/tmp/mail-config.glade.h:20
 msgid "Sources"
 msgstr "╛rСdЁa"
 
-#: mail/mail-crypto.c:1
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Nie mo©na utworzyФ potoku do %s: %s"
-
-#: mail/mail-crypto.c:1
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Nie mo©na wykonaФ %s: %s\n"
-
-#: mail/mail-crypto.c:1
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Nie mo©na utworzyФ procesu dla %s: %s"
-
-#: mail/mail-crypto.c:1 mail/mail-crypto.c:1 mail/mail-crypto.c:1
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr ""
 
-#: mail/mail-crypto.c:1 mail/mail-crypto.c:1 mail/mail-crypto.c:1
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Nie podano hasЁa."
 
-#: mail/mail-crypto.c:1 mail/mail-crypto.c:1 mail/mail-crypto.c:1
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, 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:1
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Brak dostЙpnego programu GPG/PGP."
 
-#: mail/mail-display.c:1
-msgid "Overwrite file?"
-msgstr "NadpisaФ plik?"
-
-#: mail/mail-display.c:1
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Plik o tej nazwie ju© istnieje.\n"
-"NadpisaФ go?"
-
-#: mail/mail-display.c:1
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4193,432 +4463,442 @@ msgstr ""
 "Nie mo©na otworzyФ pliku %s:\n"
 "%s"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie mo©na zapisaФ danych: %s"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Zapis zaЁ╠cznika"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nie mo©na utworzyФ katalogu tymczasowego: %s"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Zapisz na dysk..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "OtwСrz za pomoc╠ programu %s..."
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "Wy╤wietl na miejscu"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "ZewnЙtrzna przegl╠darka"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Wy╤wietl na miejscu (za pomoc╠ programu %s)"
 
-#: mail/mail-display.c:1
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Ukryj"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "ZaЁ╠cznik %s"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:845
 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:1
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "List zaszyfrowany"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Kliknij ikonЙ aby rozszyfrowaФ."
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Wska╪nik do witryny FTP (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Wska╪nik do lokalnego pliku (%s)"
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/mail-format.c:1
+#: mail/mail-format.c:1695
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr ""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Konwertowanie foldera \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Przekonwertuj folder \"%s\" na format \"%s\""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Zamykanie bie©╠cego foldera"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr ""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Tworzenie nowego foldera"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopiowanie listСw"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:341
 #, 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:1
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:781
 msgid "Registering local folder"
 msgstr "Rejestrowanie lokalnego foldera"
 
-#: mail/mail-local.c:1
+#: mail/mail-local.c:783
 msgid "Register local folder"
 msgstr "Zarejestruj lokalny folder"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtrowanie listu na ©╠danie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Filtruj list na ©╠danie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "WysyЁanie \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "WysyЁanie listu bez tematu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "Wy╤lij \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Wy╤lij list bez tematu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "WysyЁanie kolejki"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Wy╤lij kolejkЙ"
 
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "DoЁ╠czanie \"%s\""
 
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "DoЁ╠czanie listu bez tematu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "Czyszczenie \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "Wyczy╤Ф \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Przenoszenie listСw z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiowanie listСw z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Przenie╤ listy z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Skopiuj listy z \"%s\" do \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Przenoszenie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopiowanie"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Zaznaczanie listu %d z %d"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1 mail/subscribe-dialog.c:1
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Brak opisu)"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "PrzesyЁanie listСw \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "PrzesyЁanie listu bez tematu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Prze╤lij list \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Prze╤lij list bez tematu"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1665
+#, 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:1
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "Wczytywanie \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Tworzenie \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "UtwСrz \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synchronizowanie \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Zsynchronizuj \"%s\""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Wczytywanie foldera %s"
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1 mail/mail-ops.c:1
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1
+#: mail/mail-ops.c:2428
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Zapisywanie listСw z foldera \"%s\""
 
-#: mail/mail-ops.c:1
-#, c-format
-msgid "Saving messages from \"%s\""
-msgstr "Zapisywanie listСw z \"%s\""
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Zapisywanie listСw z foldera \"%s\""
 
-#: mail/mail-search-dialogue.c:1
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Zaznaczanie listu %d z %d"
+
+#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: mail/mail-summary.c:1 mail/mail-threads.c:1
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr ""
 
-#: mail/mail-threads.c:1
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:1
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4627,192 +4907,216 @@ msgstr ""
 "BЁ╠d podczas \"%s\":\n"
 "%s"
 
-#: mail/mail-threads.c:1
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:1
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:1
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Nie mo©na utworzyФ okna dialogowego."
 
-#: mail/mail-threads.c:1
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr ""
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
 #. Info
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Pobieranie listu %d z %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Zapisywanie listu %d z %d"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Zapisywanie zmian do %s"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (przesЁany list)"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "PrzesЁany list - %s"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "PrzesЁany list (bez tematu)"
 
-#: mail/mail-tools.c:1
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:147
 msgid "VFolders"
 msgstr "VFoldery"
 
-#: mail/mail-vfolder.c:1
+#: mail/mail-vfolder.c:296
 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:1 ui/evolution-mail.xml.h:1
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: mail/mail-view.c:1 ui/evolution-mail.xml.h:1
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Odpowiada nadawcy listu"
 
-#: mail/mail-view.c:1 ui/evolution-mail.xml.h:1
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Odpowiada wszystkim odbiorcom listu"
 
-#: mail/mail-view.c:1 ui/evolution-mail.xml.h:1
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "PrzesyЁa list dalej"
 
-#: mail/mail-view.c:1 ui/evolution-mail.xml.h:1
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Drukuje list"
 
-#: mail/mail-view.c:1 ui/evolution-mail.xml.h:1
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Usuwa list"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:575
+msgid "Seen"
+msgstr "Widziany"
+
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr ""
+
+#: mail/message-list.c:846
+#, 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
+
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "Nieznany"
+
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "Przebudowywanie widoku listu"
 
-#: mail/message-list.c:1
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Przebudowywanie widoku listu"
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:172
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:175
 #, c-format
 msgid "Get store for \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:282
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:286
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:290
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:1
+#: mail/subscribe-dialog.c:293
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:1 shell/e-setup.c:1
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Instalacja Evolution"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:117
 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:1
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:1 shell/e-setup.c:1
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr ""
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4823,7 +5127,7 @@ msgstr ""
 "%s\n"
 "BЁ╠d: %s"
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -4832,7 +5136,7 @@ msgstr ""
 "Nie mo©na skopiowaФ plikСw do\n"
 "\"%s\"."
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4840,7 +5144,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:1
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4848,7 +5152,7 @@ msgid ""
 "to allow installation of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:82
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -4857,45 +5161,45 @@ msgstr ""
 "Nie mo©na utworzyФ podanego foldera:\n"
 "%s"
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:134
 msgid "The specified folder name is not valid."
 msgstr ""
 
-#: shell/e-shell-folder-creation-dialog.c:1
+#: shell/e-shell-folder-creation-dialog.c:225
 msgid "Evolution - Create new folder"
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:1
+#: shell/e-shell-folder-selection-dialog.c:96
 msgid ""
 "The type of the selected folder is not valid for\n"
 "the requested operation."
 msgstr ""
 
-#: shell/e-shell-folder-selection-dialog.c:1
+#: shell/e-shell-folder-selection-dialog.c:291
 msgid "New..."
 msgstr "Nowy..."
 
-#: shell/e-shell-folder-title-bar.c:1 shell/e-shell-folder-title-bar.c:1
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
 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:1
+#: shell/e-shell-view-menu.c:114
 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:1
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Nie mo©na uruchomiФ Bug buddy."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -4907,167 +5211,161 @@ msgstr ""
 "i zarz╠dzanie kontaktami w\n"
 "╤rodowisku GNOME."
 
-#: shell/e-shell-view-menu.c:1
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr ""
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Foldery"
 
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: shell/e-shell-view.c:1 widgets/misc/e-dateedit.c:1
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
-msgid "None"
-msgstr "Brak"
-
-#: shell/e-shell-view.c:1
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Nie mo©na ustawiФ lokalnego pojemnika -- %s"
 
-#: shell/e-shell.c:1
+#: shell/e-shell.c:1208
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:125
 msgid "Group name:"
 msgstr "Nazwa grupy:"
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:234
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
 "`%s' from the shortcut bar?"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:239
 msgid "Don't remove"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:250
 msgid "_Small Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:251
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:253
 msgid "_Large Icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:254
 msgid "Show the shortcuts as large icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:265
 msgid "_New Group..."
 msgstr "_Nowa grupa..."
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:266
 msgid "Create a new shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:268
 msgid "_Remove This Group..."
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:269
 msgid "Remove this shortcut group"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:353
 msgid "Activate"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:353
 msgid "Activate this shortcut"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:1
+#: shell/e-shortcuts-view.c:356
 msgid "Remove this shortcut from the shortcut bar"
 msgstr ""
 
-#: shell/e-shortcuts.c:1
+#: shell/e-shortcuts.c:358
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage.c:1
+#: 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
+msgid "_View"
+msgstr "_Widok"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Wy╤wietla zaznaczony folder"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Bez nazwy)"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "bez bЁЙdu"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "BЁ╠d We/Wy"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Brak miejsca na utworzenie foldera"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Nie odnaleziono okre╤lonego foldera"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Brak uprawnieЯ"
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr ""
 
-#: shell/e-storage.c:1
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution.xml.h:1
-msgid "_View"
-msgstr "_Widok"
-
-#: shell/e-storage-set-view.c:1
-msgid "View the selected folder"
-msgstr "Wy╤wietla zaznaczony folder"
-
-#: shell/main.c:1
+#: shell/main.c:74
 #, fuzzy
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -5109,7 +5407,7 @@ msgstr ""
 "Mamy nadzieje, ©e spodoba Ci siЙ efekt naszej ciЙ©kiej pracy\n"
 "i niecierpliwie oczekujemy Twojej pomocy!\n"
 
-#: shell/main.c:1
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5117,1232 +5415,1293 @@ msgstr ""
 "DziЙki\n"
 "ZespСЁ Evolution\n"
 
-#: shell/main.c:1
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Nie mo©na uruchomiФ powЁoki Evlution."
 
-#: shell/main.c:1
+#: shell/main.c:178
 msgid "Disable."
 msgstr ""
 
-#: shell/main.c:1
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Nie mo©na zainicjowaФ systemu komponentСw Bonobo."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.xml.h:1
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "_Nowy serwer katalogowy"
 
-#: ui/evolution-addressbook-ldap.xml.h:1
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "_Czynno╤ci"
 
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Tworzy nowy kontakt"
 
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "UsuЯ kontakt"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Znajd╪"
 
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Odnajduje kontakt"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Nowy"
 
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Drukuj kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Zatrzymaj"
 
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Zatrzymuje wczytywanie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Wy╤wietl wszystkie"
 
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Wy╤wietla wszystkie kontakty"
 
-#: ui/evolution-addressbook.xml.h:1
-msgid "_New Contact"
-msgstr "_Nowy Kontakt"
-
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "_Drukuj kontakty..."
 
-#: ui/evolution-addressbook.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_Szukaj kontaktСw"
 
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_NarzЙdzia"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 dni"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Terminarz"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Ustawienia terminarza..."
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Tworzy nowy termianrz"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "DzieЯ"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Przemieszcza w czasie do tyЁu"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Przemieszcza w czasie do przodu"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Przejd╪"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Przemieszcza do podanej daty"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Przemieszcza do bie©╠cego czasu"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Miesi╠c"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "New Ca_lendar"
-msgstr "Nowy _terminarz"
-
-#: ui/evolution-calendar.xml.h:1 ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "NastЙpny"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Otwiera terminarz"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Poprzedni"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Drukuje terminarz"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:25
 msgid "Save calendar as something else"
 msgstr "Zapisuje terminarz w innej formie"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Wy╤wietla jeden dzieЯ"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Wy╤wietla jeden miesi╠c"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Wy╤wietla jeden tydzieЯ"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Wy╤wietla tydzieЯ roboczy"
 
-#: ui/evolution-calendar.xml.h:1 widgets/misc/e-dateedit.c:1
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Dzi╤"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "TydzieЯ"
 
-#: ui/evolution-calendar.xml.h:1 ui/evolution.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Nowy"
 
-#: ui/evolution-calendar.xml.h:1
-msgid "_New appointment..."
-msgstr "_Nowy termin..."
-
-#: ui/evolution-calendar.xml.h:1
-msgid "_Open"
-msgstr "_OtwСrz"
-
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "_OtwСrz terminarz"
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr ""
 
-#: ui/evolution-calendar.xml.h:1
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "_Zapisz terminarz jako"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:7
 msgid "Delete this item"
 msgstr "Usuwa bie©╠cy element"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:8
 msgid "Delete..."
 msgstr "UsuЯ..."
 
-#: ui/evolution-contact-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:9
 msgid "Help"
 msgstr "Pomoc"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:10
 msgid "Print En_velope..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
 msgid "Print this item"
 msgstr "Drukuje bie©╠cy element"
 
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Drukuj..."
 
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Zapisz j_ako..."
 
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
 msgid "Save and Close"
 msgstr "Zapisz i zamknij"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:15
 msgid "Save the contact and close the dialog box"
 msgstr "Zapisuje kontakt i zamyka okno dialogowe"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:16
 msgid "Se_nd contact to other..."
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
 msgid "See online help"
 msgstr ""
 
-#: ui/evolution-contact-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:18
 msgid "Send _message to contact..."
 msgstr "Wy╤lij _list do kontaktu..."
 
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1 ui/evolution-subscribe.xml.h:1
-#: ui/evolution.xml.h:1
+#: 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
 msgid "_File"
 msgstr "_Plik"
 
-#: ui/evolution-contact-editor.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:20
 msgid "_Print..."
 msgstr "_Drukuj..."
 
-#: ui/evolution-contact-editor.xml.h:1 ui/evolution-event-editor.xml.h:1
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Zapisz"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:6
 msgid "About this application"
 msgstr "Informacje o aplikacji"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:7
 msgid "About..."
 msgstr "Informacje o..."
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:8
 msgid "Actio_ns"
 msgstr "_Czynno╤ci"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:9
 msgid "C_lear"
 msgstr "Wyc_zy╤Ф"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:10
 msgid "C_ut"
 msgstr "_Wytnij"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "Wyczy╤Ф"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "Czy╤ci zaznaczenie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:14
 msgid "Close this appointment"
 msgstr "Zamyka termin"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:16
 msgid "Copy the selection"
 msgstr "Kopiuje zaznaczenie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:17
 msgid "Cut"
 msgstr "Wytnij"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:18
 msgid "Cut the selection"
 msgstr "Wycina zaznaczenie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:21
 msgid "Dump XML"
 msgstr "Wypisz XML"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:22
 msgid "Dump the UI Xml description"
 msgstr "Wypisuje opis interfejsu u©ytkownika w XML-u"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:23
 msgid "FIXME: Address _Book..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:24
 msgid "FIXME: Ch_oose Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:25
 msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:26
 msgid "FIXME: Cop_y to Folder..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:27
 msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:28
 msgid "FIXME: Define Print _Styles"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:29
 msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:30
 msgid "FIXME: Fi_rst Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:31
 msgid "FIXME: For_ward"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:32
 msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:33
 msgid "FIXME: Help"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:34
 msgid "FIXME: In_complete Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:35
 msgid "FIXME: Insert File"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:36
 msgid "FIXME: It_em..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:37
 msgid "FIXME: Paste _Special... "
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:38
 msgid "FIXME: Print Pre_view"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:39
 msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:40
 msgid "FIXME: Publish _Form..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:41
 msgid "FIXME: Rec_urrence..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:42
 msgid "FIXME: S_end"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:43
 msgid "FIXME: Save Attac_hments..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:44
 msgid "FIXME: Script _Debugger"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:46
 msgid "FIXME: _Contact"
 msgstr "_Kontakt"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:47
 msgid "FIXME: _Customize..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:48
 msgid "FIXME: _File..."
 msgstr "_Plik..."
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:49
 msgid "FIXME: _Font..."
 msgstr "_Czcionka..."
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:50
 msgid "FIXME: _Formatting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:51
 msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:52
 msgid "FIXME: _Journal Entry"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:53
 msgid "FIXME: _Last Item in Folder"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:54
 msgid "FIXME: _Mail Message"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:55
 msgid "FIXME: _Memo Style"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:57
 msgid "FIXME: _New Appointment"
 msgstr "_Nowy termin"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:58
 msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:59
 msgid "FIXME: _Object..."
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:60
 msgid "FIXME: _Paragraph..."
 msgstr "_Akapit..."
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:61
 msgid "FIXME: _Spelling..."
 msgstr "P_isownia..."
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:62
 msgid "FIXME: _Standard"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:63
 msgid "FIXME: _Task"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:64
 msgid "FIXME: _Unread Item"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:65
 msgid "FIXME: what goes here?"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:68
 msgid "Find Again"
 msgstr "Znajd╪ ponownie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Znajd╪ p_onownie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:70
 msgid "Go to the next item"
 msgstr "Przechodzi do nastЙpnego elementu"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:71
 msgid "Go to the previous item"
 msgstr "Przechodzi do poprzedniego elementu"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:72
 msgid "Modify the file's properties"
 msgstr "Modyfikuje wЁa╤ciwo╤ci pliku"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:73
 msgid "N_ext"
 msgstr "_NastЙpny"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:75
 msgid "Paste"
 msgstr "Wklej"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:76
 msgid "Paste the clipboard"
 msgstr "Wkleja zawarto╤Ф schowka"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "_Poprzedni"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:78
 msgid "Previous"
 msgstr "Poprzedni"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:79
 msgid "Print S_etup..."
 msgstr "Ustawienia _wydruku..."
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:80
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:83
 msgid "Properties"
 msgstr "WЁa╤ciwo╤ci"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:84
 msgid "Redo"
 msgstr "PonСw"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:85
 msgid "Redo the undone action"
 msgstr "Ponawia cofniЙt╠ czynno╤Ф"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:86
 msgid "Replace"
 msgstr "Zast╠p"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:87
 msgid "Replace a string"
 msgstr "ZastЙpuje napis"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Zapisuje termin i zamyka okno"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Zapisuje bie©╠cy plik"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:93
 msgid "Schedule Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:94
 msgid "Schedule _Meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:95
 msgid "Schedule some sort of a meeting"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:96
 msgid "Search again for the same string"
 msgstr "Ponownie wyszukuje ten sam napis"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:97
 msgid "Search for a string"
 msgstr "Wyszukuje napis"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:99
 msgid "Select All"
 msgstr "Zaznacz wszystkie"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:100
 msgid "Select everything"
 msgstr "Zaznacza wszystko"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:101
 msgid "Setup the page settings for your current printer"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:102
 msgid "Undo"
 msgstr "Cofnij"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:103
 msgid "Undo the last action"
 msgstr "Cofa ostatni╠ czynno╤Ф"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "_Informacje o..."
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:106
 msgid "_Copy"
 msgstr "_Kopiuj"
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-message-composer.xml.h:1
-#: ui/evolution-subscribe.xml.h:1 ui/evolution.xml.h:1
+#: 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
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:111
 msgid "_Find..."
 msgstr "_Znajd╪..."
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:112
 msgid "_Forms"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1 ui/evolution-message-composer.xml.h:1
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "Pomo_c"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:114
 msgid "_Insert"
 msgstr "_Wstaw"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:115
 msgid "_Object"
 msgstr "_Obiekt"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:116
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:117
 msgid "_Print"
 msgstr "_Drukuj"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:118
 msgid "_Properties..."
 msgstr "_WЁa╤ciwo╤ci..."
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:119
 msgid "_Redo"
 msgstr "_PonСw"
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:120
 msgid "_Replace..."
 msgstr "_Zast╠p..."
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:122
 msgid "_Toolbars"
 msgstr ""
 
-#: ui/evolution-event-editor.xml.h:1
+#: po/tmp/evolution-event-editor.xml.h:124
 msgid "_Undo"
 msgstr "_Cofnij"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "UtwСrz"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Tworzy nowy list"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Kopiuje list do nowego foldera"
 
-#: ui/evolution-mail.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "_Folder"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "UtwСrz filtr w oparciu o n_adawcЙ"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "UtwСrz filtr w oparciu o o_dbiorcСw"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Zapomnij _hasЁa"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Pobierz"
 
-#: ui/evolution-mail.xml.h:1
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "_Filtry listСw..."
 
-#: ui/evolution-mail.xml.h:1
-msgid "Manage Subscriptions..."
-msgstr ""
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Opis:"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "Oznacz jako p_rzeczytany"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "Oznacz jako _nieprzeczytany"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Przenie╤"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Przenosi list do nowego foldera"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Podgl╠d wydruku listu..."
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Drukuje list na drukarce"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Wydrukuj list..."
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Odpowiedz _wszystkim"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Odpowiedz _nadawcy"
 
-#: ui/evolution-mail.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Zaznacz _wszystkie"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "WysyЁa listy w kolejce i pobiera nowe"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "Wy╤wietlanie listСw z wyodrЙbnieniem w╠tkСw"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "UtwСrz VFolder w oparciu o _nadawcЙ"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "UtwСrz VFolder w oparciu o _odbiorcСw"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:44
 msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "_Zastosuj filtry"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "_Skonfiguruj folder"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:47
 msgid "_Copy to Folder..."
 msgstr "_Skopiuj do foldera..."
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "_Zredaguj list"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "_Wyczy╤Ф"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "UtwСrz filtr w oparciu o t_emat"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "_Prze╤lij"
 
-#: ui/evolution-mail.xml.h:1 ui/evolution-subscribe.xml.h:1
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_OdwrСФ zaznaczenie"
 
-#: ui/evolution-mail.xml.h:1
-msgid "_Mail Configuration..."
-msgstr "Konfiguracja _listСw"
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "Konfiguracja poczty"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_List"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Move to Folder..."
 msgstr "P_rzenie╤ do foldera..."
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "_OtwСrz w nowym oknie"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "_Drukuj list"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Zapisz jako..."
+
+#: po/tmp/evolution-mail.xml.h:60
 msgid "_Source"
 msgstr "╛_rСdЁo"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "Z _w╠tkami"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Undelete"
 msgstr "_Cofnij usuniЙcie"
 
-#: ui/evolution-mail.xml.h:1
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "UtwСrz VFolder w oparciu o _temat"
 
-#: ui/evolution-mail.xml.h:1
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "Edytor _wirtualnych folderСw..."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:6
 msgid "Attach"
 msgstr "ZaЁ╠cz"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "Bold"
-msgstr "Pogrubienie"
-
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "Zamyka bie©╠cy plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "Insert a file as text into the message"
 msgstr "Wstawia zawarto╤Ф pliku jako tekst do listu"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "Wstaw plik tekstowy.."
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "Otwiera plik"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Zapisz jako"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Zapisz do foldera..."
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Zapisuje list w podanym folderze"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Wy╤lij"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "Wy╤lij pС╪_niej"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "Wy╤lij pС╪_niej"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "Natychmiast wysyЁa wiadomo╤Ф"
 
-#: ui/evolution-message-composer.xml.h:1
-msgid "Sets something as bold"
-msgstr "Pogrubia co╤"
-
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "Wy╤wietla / ukrywa zaЁ╠czniki"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "Wy╤wietlanie _zaЁ╠cznikСw"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "PrzeЁ╠cza wy╤wietlanie zaЁ╠cznikСw"
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: ui/evolution-message-composer.xml.h:1
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "_OtwСrz..."
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.xml.h:1
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:1
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Od╤wie© listЙ"
 
-#: ui/evolution-subscribe.xml.h:1
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Od╤wie©a listЙ folderСw"
 
-#: ui/evolution-subscribe.xml.h:1
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr ""
 
-#: ui/evolution-subscribe.xml.h:1
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "Zapisz"
 
-#: ui/evolution-subscribe.xml.h:1
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Wypisz"
 
 #.
 #. * Translatable strings file generated by extract-ui.
-#. * Add this file to your project's POTFILES.in
-#. * DO NOT compile it as part of your application.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.xml.h:1
-msgid "Create a new folder"
-msgstr "Tworzy nowy folder"
-
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Wy╤wietla inny folder"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Za_koЯcz"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr ""
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "KoЯczy pracЙ programu"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "_Rozpoczynanie"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Wy╤wietla informacje o Evolution"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Wy╤wietlanie paska f_olderСw"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Wy╤wietlanie paska _skrСtСw"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:14
 msgid "Submit _Bug Report"
 msgstr "Wy╤lij zgЁoszenie _bЁЙdu"
 
-#: ui/evolution.xml.h:1
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:15
+#, fuzzy
+msgid "Submit bug report using Bug Buddy."
 msgstr "WysyЁa zgЁoszenie bЁЙdu za pomoc╠ Bug Buddy"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "PrzeЁ╠cza wy╤wietlanie paska folderСw"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "PrzeЁ╠cza wy╤wietlanie paska skrСtСw"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr ""
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr ""
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_Informacje o Evolution..."
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Termin (FIXME)"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.xml.h:1
-msgid "_Create New Folder..."
-msgstr "_UtwСrz nowy folder..."
-
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Folder"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "_Przejd╪ do foldera..."
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Indeks"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr ""
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Ustawienia"
 
-#: ui/evolution.xml.h:1
+#: po/tmp/evolution.xml.h:33
 msgid "_Task (FIXME)"
 msgstr "_Zadanie (FIXME)"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#. 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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
 msgid "Busy"
 msgstr "ZajЙty"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
 msgid "Out of Office"
 msgstr "Poza biurem"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
 msgid "No Information"
 msgstr "Brak informacji"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 msgid "_Options"
 msgstr "_Opcje"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
 msgid "Show _Only Working Hours"
 msgstr "Wy╤wietlanie _tylko godzin roboczych"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
 msgid "_All People and Resources"
 msgstr "_Wszyscy ludzie i zasoby"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
 msgid "All _People and One Resource"
 msgstr "Wszyscy _ludzie i jeden zasСb"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
 msgid "_Required People"
 msgstr "_Wymagani ludzie"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
 msgid "Required People and _One Resource"
 msgstr "Wymagani ludzie i j_eden zasСb"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
 msgid "Meeting _start time:"
 msgstr "Czas p_ocz╠tku spotkania:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
 msgid "Meeting _end time:"
 msgstr "Czas _koЯca spotkania:"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
 msgid "All Attendees"
 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:1
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:1
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1 widgets/misc/e-calendar-item.c:1
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:1
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:1
+#: widgets/misc/e-dateedit.c:408
 msgid "Now"
 msgstr "Teraz"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
-#: widgets/misc/e-dateedit.c:1
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1 widgets/misc/e-dateedit.c:1
-#: widgets/misc/e-dateedit.c:1
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: widgets/shortcut-bar/e-group-bar.c:1
+#: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Grupa %i"
+
+#~ msgid "window2"
+#~ msgstr "okno2"
+
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Nie mo©na pobraФ listu: %s"
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr ""
+#~ "Nie mo©na zmieniФ nazwy foldera %s na %s: folder o nazwie docelowej istnieje"
+
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Nie mo©na skopiowaФ danych do pliku wyj╤ciowego: %s"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Nie mo©na zmieniФ nazwy foldera \"%s\": %s istnieje"
+
+#~ 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"
+
+#~ msgid "Flagged"
+#~ msgstr "Oznaczony"
+
+#~ msgid "Set Flag"
+#~ msgstr "Oznacz"
+
+#~ msgid "Forward as Attachment"
+#~ msgstr "Prze╤lij jako zaЁ╠cznik"
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Nie mo©na utworzyФ potoku do %s: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Nie mo©na wykonaФ %s: %s\n"
+
+#~ msgid "Saving messages from \"%s\""
+#~ msgstr "Zapisywanie listСw z \"%s\""
+
+#~ msgid "_New Contact"
+#~ msgstr "_Nowy Kontakt"
+
+#~ msgid "New Ca_lendar"
+#~ msgstr "Nowy _terminarz"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Nowy termin..."
+
+#~ msgid "_Open"
+#~ msgstr "_OtwСrz"
+
+#~ msgid "_Mail Configuration..."
+#~ msgstr "Konfiguracja _listСw"
+
+#~ msgid "Bold"
+#~ msgstr "Pogrubienie"
+
+#~ msgid "Sets something as bold"
+#~ msgstr "Pogrubia co╤"
+
+#~ msgid "Create a new folder"
+#~ msgstr "Tworzy nowy folder"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "_UtwСrz nowy folder..."
diff --git a/po/pt.po b/po/pt.po
index 988645d447..75b30d9b4a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2000-06-20 14:27+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -13,566 +13,784 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:57
-#: calendar/gui/evolution-calendar-control.c:64 calendar/gui/main.c:68
-msgid "Could not initialize Bonobo"
-msgstr "NЦo se consegui inicializar Bonobo"
-
-#: addressbook/contact-editor/e-contact-editor.c:578
-#: calendar/gui/event-editor.c:1118
+#: addressbook/backend/ebook/e-card.c:3046
 #, fuzzy
-msgid "FIXME: _Appointment"
-msgstr "_Compromisso"
-
-#: addressbook/contact-editor/e-contact-editor.c:579
-#: calendar/gui/event-editor.c:1119
-#, fuzzy
-msgid "FIXME: Meeting Re_quest"
-msgstr "Pedido de _encontro"
+msgid "Card: "
+msgstr "Carro"
 
-#: addressbook/contact-editor/e-contact-editor.c:581
-#: calendar/gui/event-editor.c:1121
+#: addressbook/backend/ebook/e-card.c:3048
 #, fuzzy
-msgid "FIXME: _Mail Message"
-msgstr "Mensagem de _correio"
+msgid ""
+"\n"
+"Name: "
+msgstr "Nome"
 
-#: addressbook/contact-editor/e-contact-editor.c:582
-#: calendar/gui/event-editor.c:1122
-#, fuzzy
-msgid "FIXME: _Contact"
-msgstr "_Contacto"
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:583
-#: calendar/gui/event-editor.c:1123
-msgid "FIXME: _Task"
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:584
-#: calendar/gui/event-editor.c:1124
-#, fuzzy
-msgid "FIXME: Task _Request"
-msgstr "_Pedido de tarefa"
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:585
-#: calendar/gui/event-editor.c:1125
-#, fuzzy
-msgid "FIXME: _Journal Entry"
-msgstr "_Entrada diАria?"
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:586
-#: calendar/gui/event-editor.c:1126
-msgid "FIXME: _Note"
+#: addressbook/backend/ebook/e-card.c:3053
+msgid ""
+"\n"
+"  Suffix:     "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:588
-#: addressbook/contact-editor/e-contact-editor.c:693
-#: calendar/gui/event-editor.c:1128 calendar/gui/event-editor.c:1235
-msgid "FIXME: Ch_oose Form..."
+#: addressbook/backend/ebook/e-card.c:3067
+msgid ""
+"\n"
+"Birth Date: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:593
-#: calendar/gui/event-editor.c:1133
-msgid "FIXME: _Memo Style"
+#: addressbook/backend/ebook/e-card.c:3078
+#, fuzzy
+msgid ""
+"\n"
+"Address:"
+msgstr "EndereГo"
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:595
-#: calendar/gui/event-editor.c:1135
-msgid "FIXME: Define Print _Styles..."
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:602
-#: calendar/gui/event-editor.c:1142
-msgid "FIXME: S_end"
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:606
-#: calendar/gui/event-editor.c:1146
-#, fuzzy
-msgid "FIXME: Save Attac_hments..."
-msgstr "Adicionar anexo..."
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:608
-#: calendar/gui/event-editor.c:1148
-msgid "FIXME: _Delete"
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:609
-#: calendar/gui/event-editor.c:1149
-msgid "FIXME: _Move to Folder..."
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:610
-#: calendar/gui/event-editor.c:1150
-msgid "FIXME: Cop_y to Folder..."
+#: addressbook/backend/ebook/e-card.c:3086
+msgid ""
+"\n"
+"  Country:     "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:612
-#: calendar/gui/event-editor.c:1152
-msgid "Page Set_up"
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:613
-#: calendar/gui/event-editor.c:1153
-msgid "FIXME: Print Pre_view"
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:634
-#: calendar/gui/event-editor.c:1174
-msgid "FIXME: Paste _Special..."
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:639
-#: calendar/gui/event-editor.c:1179
-msgid "FIXME: Mark as U_nread"
+#: addressbook/backend/ebook/e-card.c:3138
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr "Correio electrСnico 2"
+
+#: addressbook/backend/ebook/e-card.c:3141
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:"
+msgstr "Correio electrСnico 2"
+
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:643
-#: calendar/gui/event-editor.c:1183
-msgid "_Object"
-msgstr "_Objecto"
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:648
-#: addressbook/contact-editor/e-contact-editor.c:655
-#: calendar/gui/event-editor.c:1188 calendar/gui/event-editor.c:1195
-msgid "FIXME: _Item"
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: addressbook/contact-editor/e-contact-editor.c:656
-#: calendar/gui/event-editor.c:1189 calendar/gui/event-editor.c:1196
-msgid "FIXME: _Unread Item"
+#: addressbook/backend/ebook/e-card.c:3178
+msgid ""
+"\n"
+"Business Role: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:650
-#: calendar/gui/event-editor.c:1190
-msgid "FIXME: Fi_rst Item in Folder"
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:657
-#: calendar/gui/event-editor.c:1197
-msgid "FIXME: _Last Item in Folder"
+#: addressbook/backend/ebook/e-card.c:3191
+msgid ""
+"\n"
+"  Name:  "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:662
-#: calendar/gui/event-editor.c:1202
-msgid "FIXME: _Standard"
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:664
-#: calendar/gui/event-editor.c:1204
-msgid "FIXME: __Formatting"
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:667
-#: calendar/gui/event-editor.c:1207
-msgid "FIXME: _Customize..."
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:672
-#: calendar/gui/event-editor.c:1212
-msgid "Pre_vious"
-msgstr "An_terior"
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:673
-#: calendar/gui/event-editor.c:1213
-msgid "Ne_xt"
-msgstr "PrС_ximo"
+#: addressbook/backend/ebook/e-card.c:3199
+msgid ""
+"\n"
+"Categories: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:675
-#: calendar/gui/event-editor.c:1217
-msgid "_Toolbars"
-msgstr "_Ferramentas"
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:680
-#: calendar/gui/event-editor.c:1222
-msgid "FIXME: _File..."
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:681
-#: calendar/gui/event-editor.c:1223
-msgid "FIXME: It_em..."
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:682
-#: calendar/gui/event-editor.c:1224
-msgid "FIXME: _Object..."
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: 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/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
+msgid "Could not initialize Bonobo"
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#. This array must be in the same order as enumerations
+#. in GnomePilotConduitSyncType as they are used as index.
+#. Custom type implies Disabled state.
+#.
+#: addressbook/conduit/address-conduit-control-applet.c:77
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
+#: calendar/conduits/todo/todo-conduit-control-applet.c:77
+msgid "Disabled"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:687
-#: calendar/gui/event-editor.c:1229
-msgid "FIXME: _Font..."
+#: addressbook/conduit/address-conduit-control-applet.c:78
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
+#: calendar/conduits/todo/todo-conduit-control-applet.c:78
+msgid "Synchronize"
+msgstr "Sincronizar"
+
+#: addressbook/conduit/address-conduit-control-applet.c:79
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
+#: calendar/conduits/todo/todo-conduit-control-applet.c:79
+msgid "Copy From Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:688
-#: calendar/gui/event-editor.c:1230
-msgid "FIXME: _Paragraph..."
+#: addressbook/conduit/address-conduit-control-applet.c:80
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
+#: calendar/conduits/todo/todo-conduit-control-applet.c:80
+msgid "Copy To Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:695
-#: calendar/gui/event-editor.c:1237
-msgid "FIXME: Desi_gn This Form"
+#: addressbook/conduit/address-conduit-control-applet.c:81
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
+#: calendar/conduits/todo/todo-conduit-control-applet.c:81
+msgid "Merge From Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:696
-#: calendar/gui/event-editor.c:1238
-msgid "FIXME: D_esign a Form..."
+#: addressbook/conduit/address-conduit-control-applet.c:82
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
+#: calendar/conduits/todo/todo-conduit-control-applet.c:82
+msgid "Merge To Pilot"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:698
-#: calendar/gui/event-editor.c:1240
-msgid "FIXME: Publish _Form..."
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/event-editor.c:1241
-msgid "FIXME: Pu_blish Form As..."
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+msgid "Original Author:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:701
-#: calendar/gui/event-editor.c:1243
-msgid "FIXME: Script _Debugger"
+#: addressbook/conduit/address-conduit-control-applet.c:123
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+msgid "Eskil Heyn Olsen <deity@eskil.dk>"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:706
-#: calendar/gui/event-editor.c:1248
-msgid "FIXME: _Spelling..."
+#: addressbook/conduit/address-conduit-control-applet.c:127
+msgid "Evolution Addressbook Conduit"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:708
-#: calendar/gui/event-editor.c:1253
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
 #, fuzzy
-msgid "_Forms"
-msgstr "_Pasta"
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+msgstr "(C) 1998 Free Software Foundation"
 
-#: addressbook/contact-editor/e-contact-editor.c:713
-msgid "FIXME: _New Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution addressbook conduit.\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:714
-msgid "FIXME: New _Contact from Same Company"
+#: addressbook/conduit/address-conduit-control-applet.c:131
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
+msgid "gnome-unknown.xpm"
+msgstr "gnome-unknown.xpm"
+
+#: addressbook/conduit/address-conduit-control-applet.c:162
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
+#: calendar/conduits/todo/todo-conduit-control-applet.c:162
+msgid "Synchronize Action"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:716
-msgid "FIXME: New _Letter to Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:214
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
+msgid "Conduit state"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:717
-msgid "FIXME: New _Message to Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
+msgid ""
+"No pilot configured, please choose the\n"
+"'Pilot Link Properties' capplet first."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:718
-msgid "FIXME: New Meetin_g with Contact"
+#: addressbook/conduit/address-conduit-control-applet.c:285
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
+#: calendar/conduits/todo/todo-conduit-control-applet.c:285
+msgid "Not connected to the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:719
-msgid "FIXME: _Plan a Meeting..."
+#: addressbook/conduit/address-conduit-control-applet.c:290
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
+#, fuzzy
+msgid ""
+"An error occured when trying to fetch\n"
+"pilot list from the gnome-pilot daemon"
 msgstr ""
+"Um excepГЦo ocorreu enquanto se tentava carregar dados no componente com "
+"PersistStream"
 
-#: addressbook/contact-editor/e-contact-editor.c:720
-msgid "FIXME: New _Task for Contact"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:721
-msgid "FIXME: New _Journal Entry for Contact"
+#: addressbook/conduit/address-conduit.c:210
+msgid "EBook not loaded\n"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:723
-msgid "FIXME: _Flag for Follow Up..."
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
+msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:724
-msgid "FIXME: _Display Map of Address"
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
+#, 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
+msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:725
-msgid "FIXME: _Open Web Page"
+#.
+#. * 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/e-contact-editor.c:727
-msgid "FIXME: Forward as _vCard"
+#: addressbook/contact-editor/categories-strings.h:8
+msgid "Item(s) belong to these categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:728
-#: calendar/gui/event-editor.c:1266
-msgid "FIXME: For_ward"
+#: addressbook/contact-editor/categories-strings.h:9
+msgid "Available Categories:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:740
-#: calendar/gui/event-editor.c:1279
-msgid "_Insert"
-msgstr "_Inserir"
+#.
+#. * 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
+#, fuzzy
+msgid "Delete Contact?"
+msgstr "Apagar um contacto"
 
-#: addressbook/contact-editor/e-contact-editor.c:741
-#: calendar/gui/event-editor.c:1280
-msgid "F_ormat"
-msgstr "F_ormato"
+#.
+#. * 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/e-contact-editor-strings.h:7
+#, fuzzy
+msgid "_Add"
+msgstr "Adicionar"
 
-#. FIXME: add Favorites here
-#: addressbook/contact-editor/e-contact-editor.c:742
-#: calendar/gui/event-editor.c:1281 shell/e-shell-view-menu.c:468
-msgid "_Tools"
-msgstr "_Ferramentas"
+#: addressbook/contact-editor/e-contact-editor-strings.h:8
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#, fuzzy
+msgid "_Delete"
+msgstr "Apagar"
 
-#: addressbook/contact-editor/e-contact-editor.c:743
-#: calendar/gui/event-editor.c:1282
-msgid "Actio_ns"
-msgstr "_AcГУes"
+#: addressbook/contact-editor/e-contact-editor-strings.h:9
+msgid "Phone Types"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:774
-#: calendar/gui/event-editor.c:1320
-msgid "FIXME: Save and Close"
+#: addressbook/contact-editor/e-contact-editor-strings.h:10
+#: addressbook/contact-editor/e-contact-editor-strings.h:12
+msgid "New phone type"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:775
-#: calendar/gui/event-editor.c:1321
-msgid "Save the appointment and close the dialog box"
+#.
+#. * 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
+msgid "Add"
+msgstr "Adicionar"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:13
+#, fuzzy
+msgid "Contact Editor"
+msgstr "_Contacto"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:14
+#, fuzzy
+msgid "_Full Name..."
+msgstr "Nome completo:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:15
+msgid "File As:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:16
+#, fuzzy
+msgid "Web page address:"
+msgstr "EndereГo de correio:"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:17
+msgid "Wants to receive _HTML mail"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:779
-#: calendar/gui/event-editor.c:1325
-msgid "FIXME: Print..."
+#: addressbook/contact-editor/e-contact-editor-strings.h:18
+msgid "_Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:780
-#: calendar/gui/event-editor.c:1326
-msgid "Print this item"
-msgstr "Imprimir este item"
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
+#, fuzzy
+msgid "_Home"
+msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:781
-#: calendar/gui/event-editor.c:1327
-msgid "FIXME: Insert File..."
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
+msgid "Business _Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:782
-#: calendar/gui/event-editor.c:1328
-msgid "Insert a file as an attachment"
-msgstr "Inserir ficheiro como anexo"
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#, fuzzy
+msgid "_Mobile"
+msgstr "TelemСvel"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "EndereГo principal de correio electrСnico"
 
-#: addressbook/contact-editor/e-contact-editor.c:784
-#: calendar/gui/event-editor.c:1330
-msgid "FIXME: Recurrence..."
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
+msgid "B_usiness"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:785
-#: calendar/gui/event-editor.c:1331
-msgid "Configure recurrence rules"
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
+msgid "_This is the mailing address"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:787
-#: calendar/gui/event-editor.c:1333
-msgid "FIXME: Invite Attendees..."
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#, fuzzy
+msgid "C_ontacts..."
+msgstr "_Contacto"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: po/tmp/task-editor-dialog.glade.h:8
+msgid "Ca_tegories..."
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:788
-#: calendar/gui/event-editor.c:1334
-msgid "Invite attendees to a meeting"
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
+msgid "_Job title:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:790
-#: calendar/gui/event-editor.c:1336
-msgid "FIXME: Delete"
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#, fuzzy
+msgid "_Company:"
+msgstr "Empresa"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#, fuzzy
+msgid "_Address..."
+msgstr "EndereГo"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: po/tmp/event-editor-dialog.glade.h:15
+msgid "General"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:791
-#: calendar/gui/event-editor.c:1337 calendar/gui/gncal-todo.c:322
-msgid "Delete this item"
-msgstr "Apagar este item"
+#: addressbook/contact-editor/e-contact-editor-strings.h:31
+msgid "_Department:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/event-editor.c:1339
-msgid "FIXME: Previous"
+#: addressbook/contact-editor/e-contact-editor-strings.h:32
+msgid "_Office:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:794
-#: calendar/gui/event-editor.c:1340
-msgid "Go to the previous item"
-msgstr "Ir para o item anterior"
+#: addressbook/contact-editor/e-contact-editor-strings.h:33
+msgid "_Profession:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:795
-#: calendar/gui/event-editor.c:1341
-msgid "FIXME: Next"
+#: addressbook/contact-editor/e-contact-editor-strings.h:34
+msgid "_Nickname:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:796
-#: calendar/gui/event-editor.c:1342
-msgid "Go to the next item"
-msgstr "Ir para o prСximo item"
+#: addressbook/contact-editor/e-contact-editor-strings.h:35
+msgid "_Spouse:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:797
-#: calendar/gui/event-editor.c:1343
-msgid "FIXME: Help"
+#: addressbook/contact-editor/e-contact-editor-strings.h:36
+msgid "_Birthday:"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:798
-#: calendar/gui/event-editor.c:1344
-msgid "See online help"
+#: addressbook/contact-editor/e-contact-editor-strings.h:37
+msgid "_Assistant's name:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:38
+msgid "_Manager's Name:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:39
+msgid "Anni_versary:"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:40
+#, fuzzy
+msgid "No_tes:"
+msgstr "_Nota"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:41
+#: po/tmp/task-editor-dialog.glade.h:13
+msgid "Details"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1213
+#: addressbook/contact-editor/e-contact-editor.c:1266
 msgid "Assistant"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1214
-#: addressbook/contact-editor/e-contact-editor.c:1318
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
 msgid "Business"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1215
+#: addressbook/contact-editor/e-contact-editor.c:1268
 msgid "Business 2"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1216
+#: addressbook/contact-editor/e-contact-editor.c:1269
 msgid "Business Fax"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1217
+#: addressbook/contact-editor/e-contact-editor.c:1270
 msgid "Callback"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
+#: addressbook/contact-editor/e-contact-editor.c:1271
 msgid "Car"
 msgstr "Carro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1219
+#: addressbook/contact-editor/e-contact-editor.c:1272
 msgid "Company"
 msgstr "Empresa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1220
-#: addressbook/contact-editor/e-contact-editor.c:1319
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
 msgid "Home"
 msgstr "Casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1221
+#: addressbook/contact-editor/e-contact-editor.c:1274
 msgid "Home 2"
 msgstr "Casa 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1222
+#: addressbook/contact-editor/e-contact-editor.c:1275
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: addressbook/contact-editor/e-contact-editor.c:1223
+#: addressbook/contact-editor/e-contact-editor.c:1276
 msgid "ISDN"
 msgstr "RDIS"
 
-#: addressbook/contact-editor/e-contact-editor.c:1224
+#: addressbook/contact-editor/e-contact-editor.c:1277
 msgid "Mobile"
 msgstr "TelemСvel"
 
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1320 mail/mail-config.c:2039
+#: addressbook/contact-editor/e-contact-editor.c:1278
+#: addressbook/contact-editor/e-contact-editor.c:1373
+#: po/tmp/mail-config.glade.h:17
 msgid "Other"
 msgstr "Outro"
 
-#: addressbook/contact-editor/e-contact-editor.c:1226
+#: addressbook/contact-editor/e-contact-editor.c:1279
 msgid "Other Fax"
 msgstr "Outro Fax"
 
-#: addressbook/contact-editor/e-contact-editor.c:1227
+#: addressbook/contact-editor/e-contact-editor.c:1280
 msgid "Pager"
 msgstr "Bip"
 
-#: addressbook/contact-editor/e-contact-editor.c:1228
+#: addressbook/contact-editor/e-contact-editor.c:1281
 msgid "Primary"
 msgstr "PrimАrio"
 
-#: addressbook/contact-editor/e-contact-editor.c:1229
+#: addressbook/contact-editor/e-contact-editor.c:1282
 msgid "Radio"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1230
+#: addressbook/contact-editor/e-contact-editor.c:1283
 msgid "Telex"
 msgstr "Telex"
 
-#: addressbook/contact-editor/e-contact-editor.c:1231
+#: addressbook/contact-editor/e-contact-editor.c:1284
 msgid "TTY/TDD"
 msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Primary Email"
-msgstr "EndereГo principal de correio electrСnico"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/contact-editor/e-contact-editor.c:1329
 msgid "Email 2"
 msgstr "Correio electrСnico 2"
 
-#: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/contact-editor/e-contact-editor.c:1330
 msgid "Email 3"
 msgstr "Correio electrСnico 3"
 
-#: addressbook/gui/component/addressbook.c:417 mail/message-list.c:628
-msgid "To"
-msgstr "Para"
-
-#: addressbook/gui/component/addressbook.c:418 mail/message-list.c:600
-msgid "From"
-msgstr "De"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/fulladdr.glade.h:6
+#, fuzzy
+msgid "Address _2:"
+msgstr "EndereГo"
 
-#: addressbook/gui/component/addressbook.c:419
-msgid "Cc"
-msgstr "Cc"
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:424
-#: calendar/gui/calendar-commands.c:544
-msgid "New"
-msgstr "Novo"
+#: po/tmp/fulladdr.glade.h:8
+#, fuzzy
+msgid "Check Address"
+msgstr "EndereГo"
 
-#: addressbook/gui/component/addressbook.c:424
-msgid "Create a new contact"
-msgstr "Criar um novo contacto"
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:428
-#: mail/folder-browser-factory.c:37
-msgid "Find"
+#: po/tmp/fulladdr.glade.h:10
+#, fuzzy
+msgid "Finland"
 msgstr "Encontrar"
 
-#: addressbook/gui/component/addressbook.c:428
-msgid "Find a contact"
-msgstr "Encontrar um contacto"
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:429
-#: addressbook/gui/component/addressbook.c:496
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:48
-msgid "Print"
-msgstr "Imprimir"
+#: po/tmp/fulladdr.glade.h:12
+#, fuzzy
+msgid "_Address:"
+msgstr "EndereГo"
 
-#: addressbook/gui/component/addressbook.c:429
-msgid "Print contacts"
-msgstr "Imprimir contactos"
+#: po/tmp/fulladdr.glade.h:13
+msgid "_City:"
+msgstr ""
 
-#. Delete
-#: addressbook/gui/component/addressbook.c:430 calendar/gui/gncal-todo.c:494
-#: mail/folder-browser-factory.c:50 mail/mail-config.c:1865
-#: mail/mail-config.c:1961
-msgid "Delete"
-msgstr "Apagar"
+#: po/tmp/fulladdr.glade.h:14
+msgid "_PO Box:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:430
-msgid "Delete a contact"
-msgstr "Apagar um contacto"
+#: po/tmp/fulladdr.glade.h:15
+msgid "_State/Province:"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:503
-msgid "Test Select Names"
+#: po/tmp/fulladdr.glade.h:16
+msgid "_ZIP Code:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:510
-#: addressbook/gui/component/addressbook.c:1052
-msgid "As _Table"
-msgstr "Como _Tabela"
+#.
+#. * 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/fullname-strings.h:7
+#, fuzzy
+msgid "Check Full Name"
+msgstr "Nome completo:"
+
+#: addressbook/contact-editor/fullname-strings.h:8
+msgid ""
+"\n"
+"Mr.\n"
+"Mrs.\n"
+"Dr.\n"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:517
-msgid "_New Contact"
-msgstr "_Novo Contacto"
+#: addressbook/contact-editor/fullname-strings.h:13
+msgid ""
+"\n"
+"Sr.\n"
+"Jr.\n"
+"I\n"
+"II\n"
+"III\n"
+"Esq.\n"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:525
-msgid "N_ew Directory Server"
+#: addressbook/contact-editor/fullname-strings.h:21
+#, fuzzy
+msgid "_First:"
+msgstr "_Pasta"
+
+#: addressbook/contact-editor/fullname-strings.h:22
+msgid "_Title:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:23
+#, fuzzy
+msgid "_Middle:"
+msgstr "_Correio"
+
+#: addressbook/contact-editor/fullname-strings.h:24
+msgid "_Last:"
+msgstr ""
+
+#: addressbook/contact-editor/fullname-strings.h:25
+msgid "_Suffix:"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:263
+msgid "As _Minicards"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:604
+#.
+#. * 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
+msgid "As _Table"
+msgstr "Como _Tabela"
+
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "ImpossМvel abrir o livro de endereГos"
 
-#: addressbook/gui/component/addressbook.c:609
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -581,23 +799,230 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:960
-#: addressbook/gui/minicard/e-minicard.c:329
-msgid "Save as VCard"
-msgstr "Gravar como VCard"
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+msgid "Show All"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1059
-msgid "As _Minicards"
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#, fuzzy
+msgid "Advanced..."
+msgstr "Adicionar..."
+
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "Uma pasta contendo tarefas"
+
+#: addressbook/gui/component/addressbook.c:534
+msgid "Name contains"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1110
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "мcone_s pequenos"
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "O URI que o navegador de pastas mostrarА"
 
-#: addressbook/gui/minicard/e-minicard-view.c:110
+#: 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
+#, fuzzy
+msgid "Description:"
+msgstr "Nenhuma descriГЦo"
+
+#: po/tmp/ldap-server-dialog.glade.h:7
+#, fuzzy
+msgid "LDAP Server:"
+msgstr "Servidor:"
+
+#: po/tmp/ldap-server-dialog.glade.h:8
+#, fuzzy
+msgid "Name:"
+msgstr "Nome"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr ""
+
+#: po/tmp/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/select-names.glade.h:6
+#, fuzzy
+msgid "Find..."
+msgstr "Encontrar"
+
+#: po/tmp/select-names.glade.h:7
+#, fuzzy
+msgid "Message Recipients"
+msgstr "SituaГЦo das mensagens"
+
+#: po/tmp/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/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+#, fuzzy
+msgid "Search"
+msgstr "Ano"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/alphabet.glade.h:6
+msgid "123"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:7
+#, fuzzy
+msgid "a"
+msgstr "am"
+
+#: po/tmp/alphabet.glade.h:8
+#, fuzzy
+msgid "b"
+msgstr "%b"
+
+#: po/tmp/alphabet.glade.h:9
+#, fuzzy
+msgid "c"
+msgstr "Cc"
+
+#: po/tmp/alphabet.glade.h:10
+msgid "d"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:11
+#, fuzzy
+msgid "e"
+msgstr "Qa"
+
+#: po/tmp/alphabet.glade.h:12
+msgid "f"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:13
+msgid "g"
+msgstr ""
+
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+msgid "h"
+msgstr "h"
+
+#: po/tmp/alphabet.glade.h:15
+msgid "i"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:16
+msgid "j"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:17
+#, fuzzy
+msgid "k"
+msgstr "Ok"
+
+#: po/tmp/alphabet.glade.h:18
+msgid "l"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:19
+#, fuzzy
+msgid "m"
+msgstr "am"
+
+#: po/tmp/alphabet.glade.h:20
+msgid "n"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:21
+#, fuzzy
+msgid "o"
+msgstr "Para"
+
+#: po/tmp/alphabet.glade.h:22
+#, fuzzy
+msgid "p"
+msgstr "pm"
+
+#: po/tmp/alphabet.glade.h:23
+msgid "q"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:24
+#, fuzzy
+msgid "r"
+msgstr "Sx"
+
+#: po/tmp/alphabet.glade.h:25
+msgid "s"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:26
+msgid "t"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:27
+#, fuzzy
+msgid "u"
+msgstr "Do"
+
+#: po/tmp/alphabet.glade.h:28
+msgid "v"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:29
+msgid "w"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:30
+msgid "x"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:31
+msgid "y"
+msgstr ""
+
+#: po/tmp/alphabet.glade.h:32
+msgid "z"
+msgstr ""
+
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
+msgid "Save as VCard"
+msgstr "Gravar como VCard"
+
+#: addressbook/gui/widgets/e-minicard-control.c:278
+#, fuzzy
+msgid "Save in addressbook"
+msgstr "ImpossМvel abrir o livro de endereГos"
+
+#: addressbook/gui/widgets/e-minicard-view.c:111
 msgid ""
 "\n"
 "\n"
@@ -606,1110 +1031,2469 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: calendar/cal-util/timeutil.c:96 calendar/gui/print.c:544
+#.
+#. * 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
+msgid "10 pt. Tahoma"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:9
+#, fuzzy
+msgid "Body"
+msgstr "Hoje"
+
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:12
+#, fuzzy
+msgid "Font..."
+msgstr "Imprimir..."
+
+#: po/tmp/e-contact-print.glade.h:13
+#, fuzzy
+msgid "Fonts"
+msgstr "MЙs"
+
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:15
+#, fuzzy
+msgid "Format"
+msgstr "F_ormato"
+
+#: po/tmp/e-contact-print.glade.h:16
+#, fuzzy
+msgid "Header"
+msgstr "Ano"
+
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:18
+#, fuzzy
+msgid "Headings"
+msgstr "CabeГalhos:"
+
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:20
+#, fuzzy
+msgid "Height:"
+msgstr "CabeГalhos:"
+
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:26
+#, fuzzy
+msgid "Margins"
+msgstr "мcones _grandes"
+
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:28
+#, fuzzy
+msgid "Options"
+msgstr "_OpГУes"
+
+#: po/tmp/e-contact-print.glade.h:29
+#, fuzzy
+msgid "Orientation"
+msgstr "OrganizaГЦo"
+
+#: po/tmp/e-contact-print.glade.h:30
+#, fuzzy
+msgid "Page"
+msgstr "Bip"
+
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:32
+#, fuzzy
+msgid "Paper"
+msgstr "Bip"
+
+#: po/tmp/e-contact-print.glade.h:33
+#, fuzzy
+msgid "Paper source:"
+msgstr "Fontes de correio"
+
+#: po/tmp/e-contact-print.glade.h:34
+#, fuzzy
+msgid "Portrait"
+msgstr "Prioridade"
+
+#: po/tmp/e-contact-print.glade.h:35
+#, fuzzy
+msgid "Preview:"
+msgstr "Prever impressЦo"
+
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:38
+msgid "Right:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:39
+#, fuzzy
+msgid "Sections:"
+msgstr "Segundos"
+
+#: po/tmp/e-contact-print.glade.h:40
+#, fuzzy
+msgid "Shading"
+msgstr "CabeГalhos:"
+
+#: po/tmp/e-contact-print.glade.h:41
+#, fuzzy
+msgid "Size:"
+msgstr "Tamanho"
+
+#: po/tmp/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
+#, fuzzy
+msgid "Style name:"
+msgstr "Nome completo:"
+
+#: po/tmp/e-contact-print.glade.h:44
+#, fuzzy
+msgid "Top:"
+msgstr "Para:"
+
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr ""
+
+#: po/tmp/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"
 
-#: 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/cal-util/timeutil.c:98
-msgid "h"
-msgstr "h"
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
+#, fuzzy
+msgid "Evolution Calendar Conduit"
+msgstr "Atalho para _barra do Evolution"
 
-#: calendar/gui/calendar-commands.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution calendar conduit.\n"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
+msgid "Error while communicating with calendar server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:127
+#, fuzzy
+msgid "Evolution ToDo Conduit"
+msgstr "Atalho para _barra do Evolution"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution todo conduit.\n"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:60
 msgid "Outline:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:57
+#: calendar/gui/calendar-commands.c:61
 msgid "Headings:"
 msgstr "CabeГalhos:"
 
-#: calendar/gui/calendar-commands.c:58
+#: calendar/gui/calendar-commands.c:62
 msgid "Empty days:"
 msgstr "Dias vazios:"
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:63
 msgid "Appointments:"
 msgstr "Compromissos:"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:64
 msgid "Highlighted day:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:65
 msgid "Day numbers:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:66
 msgid "Current day's number:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:64
+#: calendar/gui/calendar-commands.c:68
 msgid "To-Do item that is due today:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:69
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:175
-msgid "Gnome Calendar"
-msgstr "CalendАrio do Gnome"
-
-#: calendar/gui/calendar-commands.c:178
-msgid "The GNOME personal calendar and schedule manager."
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Ficheiro nЦo encontrado"
 
-#: calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Abrir calendАrio"
 
-#: calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Gravar calendАrio"
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:708
-#: calendar/gui/gncal-todo.c:712
-msgid "Day"
-msgstr "Dia"
+#. strftime format of a weekday and a date.
+#: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+msgid "%a %m/%d/%Y"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:522
-msgid "Show 1 day"
-msgstr "Mostrar 1 dia"
+#. 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
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:525
-msgid "5 Days"
-msgstr "5 Dias"
+#. 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
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:525
-msgid "Show the working week"
-msgstr "Mostrar a semana de trabalho"
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
+msgid "Public"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:707
-msgid "Week"
-msgstr "Semana"
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
+#, fuzzy
+msgid "Private"
+msgstr "Imprimir"
 
-#: calendar/gui/calendar-commands.c:528
-msgid "Show 1 week"
-msgstr "Mostrar 1 semana"
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
+msgid "Confidential"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:531
-msgid "Month"
-msgstr "MЙs"
+#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+msgid "Unknown"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:531
-msgid "Show 1 month"
-msgstr "Mostrar 1 mЙs"
+#: calendar/gui/calendar-model.c:441
+msgid "N"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:535
-msgid "Year"
-msgstr "Ano"
+#: calendar/gui/calendar-model.c:441
+#, fuzzy
+msgid "S"
+msgstr "Do"
 
-#: calendar/gui/calendar-commands.c:535
-msgid "Show 1 year"
-msgstr "Mostrar 1 ano"
+#: calendar/gui/calendar-model.c:443
+msgid "E"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:690
-msgid "Create a new appointment"
+#: calendar/gui/calendar-model.c:443
+#, fuzzy
+msgid "W"
+msgstr "Qa"
+
+#: calendar/gui/calendar-model.c:515
+#, fuzzy
+msgid "Transparent"
+msgstr "Transportes"
+
+#: calendar/gui/calendar-model.c:518
+msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:674
-msgid "Print this calendar"
-msgstr "Imprimir este calendАrio"
+#: calendar/gui/calendar-model.c:744
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:552
-msgid "Prev"
+#. strptime format for a date.
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+msgid "%m/%d/%Y"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:552
-msgid "Go back in time"
+#. 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
+msgid "%I:%M:%S %p%n"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:553
-msgid "Today"
-msgstr "Hoje"
+#. strptime format for a time of day, in 24-hour format.
+#: calendar/gui/calendar-model.c:866
+msgid "%H:%M:%S%n"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:553
-msgid "Go to present time"
+#. 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
+msgid "%I:%M %p%n"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:554
-msgid "Next"
+#. strptime format for time of day, without seconds 24-hour format.
+#: calendar/gui/calendar-model.c:873
+msgid "%H:%M%n"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:554
-msgid "Go forward in time"
+#: calendar/gui/calendar-model.c:993
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:558
-msgid "Go to"
-msgstr "Ir para"
+#: calendar/gui/calendar-model.c:1033
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:558
-msgid "Go to a specific date"
-msgstr "Ir para uma data especМfica"
+#: calendar/gui/calendar-model.c:1073
+msgid "The priority must be between 1 and 9, inclusive"
+msgstr ""
 
-#. file menu
-#: calendar/gui/calendar-commands.c:659
-msgid "New Ca_lendar"
-msgstr "Novo Ca_lendАrio"
+#: calendar/gui/control-factory.c:125
+msgid "The URI that the calendar will display"
+msgstr "O URI que o calendАrio mostrarА"
 
-#: calendar/gui/calendar-commands.c:660
-msgid "Create a new calendar"
-msgstr "Criar um novo calendАrio"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:183
+msgid "Alarm on %A %b %d %Y %H:%M"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:663
-msgid "Open Ca_lendar"
-msgstr "Abrir Ca_lendАrio"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:190
+msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:664
-msgid "Open a calendar"
-msgstr "Abrir um calendАrio"
+#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#, fuzzy
+msgid "No summary available."
+msgstr "Nenhum sumАrio"
 
-#: calendar/gui/calendar-commands.c:668 calendar/gui/calendar-commands.c:669
-msgid "Save Calendar As"
-msgstr "Guardar CalendАrio como"
+#.
+#. * 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
+#, fuzzy
+msgid "Close"
+msgstr "Cores"
 
-#: calendar/gui/calendar-commands.c:673
-msgid "Print..."
-msgstr "Imprimir..."
+#: po/tmp/alarm-notify.glade.h:7
+#, fuzzy
+msgid "Edit appointment"
+msgstr "_Editar Compromisso"
 
-#: calendar/gui/calendar-commands.c:679
-msgid "_Close Calendar"
-msgstr "_Fechar CalendАrio"
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+#, fuzzy
+msgid "Snooze"
+msgstr "Tamanho"
 
-#: calendar/gui/calendar-commands.c:680
-msgid "Close current calendar"
-msgstr "Fechar o calendАrio corrente"
+#: po/tmp/alarm-notify.glade.h:9
+msgid "Snooze time (minutes)"
+msgstr ""
+
+#.
+#. * 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
+#, fuzzy
+msgid "05 minutes"
+msgstr "Minutos"
 
-#: calendar/gui/calendar-commands.c:690
-msgid "_New appointment..."
-msgstr "_Novo compromisso..."
+#: po/tmp/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "10 minutes"
+msgstr "Minutos"
 
-#: calendar/gui/calendar-commands.c:695
-msgid "New appointment for _today..."
-msgstr "Novo compromisso para _hoje..."
+#: po/tmp/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "12 hour (am/pm)"
+msgstr "12 horas (AM/PM)"
 
-#: calendar/gui/calendar-commands.c:696
-msgid "Create a new appointment for today"
-msgstr "Criar um novo compromisso para hoje"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "15 minutes"
+msgstr "Minutos"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "24 hour"
+msgstr "24 horas"
 
-#: calendar/gui/calendar-commands.c:704 calendar/gui/prop.c:712
-msgid "Preferences"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+#, fuzzy
+msgid "30 minutes"
+msgstr "Minutos"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "60 minutes"
+msgstr "Minutos"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:14
+#, fuzzy
+msgid "Audio Alarms"
+msgstr "Alarmes"
+
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Calendar"
+msgstr "Novo Ca_lendАrio"
+
+#: po/tmp/cal-prefs-dialog.glade.h:17
+#, fuzzy
+msgid "Calendar Preferences"
 msgstr "PreferЙncias"
 
-#: calendar/gui/calendar-commands.c:711 calendar/gui/calendar-commands.c:712
-msgid "About Calendar"
-msgstr "Sobre o calendАrio"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Cores"
+
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr ""
+
+#: po/tmp/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
+msgid "Fri"
+msgstr "Sex"
+
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Friday"
+msgstr "Sex"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr ""
 
-#. i18n: This "%s%s" indicates possession. Languages where the order is
-#. * the inverse should translate it to "%2$s%1$s".
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: po/tmp/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
+msgid "Mon"
+msgstr "Seg"
+
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Segunda-feira"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "Prioridade"
+
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "SАb"
+
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Saturday"
+msgstr "Domingo"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "Compromisso - %s"
+
+#: po/tmp/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "Show week numbers"
+msgstr "Mostrar 1 semana"
+
+#: po/tmp/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
+msgid "Sun"
+msgstr "Dom"
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Domingo"
+
+#: po/tmp/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
+msgid "Thu"
+msgstr "Qui"
+
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+#, fuzzy
+msgid "Thursday"
+msgstr "Hoje"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr ""
+
+#: po/tmp/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
+msgid "Tue"
+msgstr "Ter"
+
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+#, fuzzy
+msgid "Tuesday"
+msgstr "Hoje"
+
+#: po/tmp/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
+msgid "Wed"
+msgstr "Qua"
+
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
+#, fuzzy
+msgid "Work week"
+msgstr "Semana"
+
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:63
+#, fuzzy
+msgid "seconds."
+msgstr " segundos"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/calendar-commands.c:754
+#: po/tmp/task-editor-dialog.glade.h:6
+msgid "% Comp_lete:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:10
+msgid "Completed"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:14
+msgid "High"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr ""
+
+#: po/tmp/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
+msgid "None"
+msgstr "Nenhuma"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Normal"
+msgstr "F_ormato"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Not Started"
+msgstr "_ComeГando"
+
+#: po/tmp/task-editor-dialog.glade.h:22
+#, fuzzy
+msgid "S_ummary"
+msgstr "SumАrio"
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:24
+#, fuzzy
+msgid "Task"
+msgstr "_Tarefa"
+
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:26
+#, fuzzy
+msgid "_Contacts..."
+msgstr "_Contacto"
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:28
+#, fuzzy
+msgid "_Priority:"
+msgstr "Prioridade:"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Nenhum sumАrio"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
 #, c-format
-msgid "%s%s"
-msgstr "%s%s"
+msgid "Appointment - %s"
+msgstr "Compromisso - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Tarefa - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, fuzzy, c-format
+msgid "Journal entry - %s"
+msgstr "_Entrada diАria?"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:754
+#: calendar/gui/e-calendar-table.c:336
 #, fuzzy
-msgid "'s calendar"
-msgstr "O seu calendАrio"
+msgid "Open..."
+msgstr "_Abrir"
+
+#: calendar/gui/e-calendar-table.c:337
+msgid "Open the task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:339
+msgid "Mark Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:340
+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"
+msgstr "Apagar este item"
+
+#: calendar/gui/e-day-view-time-item.c:516
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
+
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
+#: 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-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-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
+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
+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
+msgid "Delete this appointment"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+msgid "Make this appointment movable"
+msgstr ""
+
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+msgid "Delete this occurrence"
+msgstr "Apagar esta ocurrЙncia"
+
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+msgid "Delete all occurrences"
+msgstr "Apagar todas as ocurrЙncias"
+
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr ""
 
-#. This array must be in the same order as enumerations
-#. in GnomePilotConduitSyncType as they are used as index.
-#. Custom type implies Disabled state.
 #.
-#: calendar/gui/calendar-conduit-control-applet.c:51
-msgid "Disabled"
+#. * 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
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:52
-msgid "Synchronize"
-msgstr "Sincronizar"
+#: po/tmp/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "Compromissos:"
 
-#: calendar/gui/calendar-conduit-control-applet.c:53
-msgid "Copy From Pilot"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:54
-msgid "Copy To Pilot"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:55
-msgid "Merge From Pilot"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "DiasRascunhos"
+
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:56
-msgid "Merge To Pilot"
+#: po/tmp/event-editor-dialog.glade.h:14
+#, fuzzy
+msgid "Exceptions"
+msgstr "_AcГУes"
+
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "Horas"
+
+#: po/tmp/event-editor-dialog.glade.h:17
+#, fuzzy
+msgid "Mail _to:"
+msgstr "atalhos principais"
+
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minutos"
+
+#: po/tmp/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Modify"
+msgstr "Segunda-feira"
+
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:142
-#: calendar/gui/todo-conduit-control-applet.c:110
-msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "Prever impressЦo"
+
+#: po/tmp/event-editor-dialog.glade.h:22
+#, fuzzy
+msgid "Pri_vate"
+msgstr "Activar"
+
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:144
-msgid "GnomeCalendar Conduit"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:145
-msgid "(C) 1998"
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:147
-msgid "Configuration utility for the calendar conduit.\n"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:148
-msgid "gnome-calendar-conduit.png"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:190
-msgid "Synchronize Action"
+#: po/tmp/event-editor-dialog.glade.h:28
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "SumАrio:"
+
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:261
-#: calendar/gui/todo-conduit-control-applet.c:194
-msgid "Conduit state"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:305
-#: calendar/gui/calendar-conduit-control-applet.c:316
-#: calendar/gui/todo-conduit-control-applet.c:235
-#: calendar/gui/todo-conduit-control-applet.c:246
-msgid ""
-"No pilot configured, please choose the\n"
-"'Pilot Link Properties' capplet first."
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:332
-#: calendar/gui/calendar-conduit-control-applet.c:333
-#: calendar/gui/todo-conduit-control-applet.c:265
-#: calendar/gui/todo-conduit-control-applet.c:266
-msgid "Cannot initialze the GnomePilot Daemon"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
 msgstr ""
 
-#: calendar/gui/calendar-conduit-control-applet.c:339
-#: calendar/gui/calendar-conduit-control-applet.c:340
-#: calendar/gui/todo-conduit-control-applet.c:272
-#: calendar/gui/todo-conduit-control-applet.c:273
-msgid "Cannot connect to the GnomePilot Daemon"
+#: po/tmp/event-editor-dialog.glade.h:33
+#, fuzzy
+msgid "_End time:"
+msgstr "Hora de _fim de _encontro"
+
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "_Correio"
+
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
 msgstr ""
 
-#: calendar/gui/calendar-conduit.c:116 calendar/gui/calendar-conduit.c:156
-#: calendar/gui/calendar-conduit.c:239 calendar/gui/calendar-conduit.c:279
-#: calendar/gui/calendar-conduit.c:501 calendar/gui/calendar-conduit.c:542
-#: calendar/gui/calendar-conduit.c:858 calendar/gui/calendar-conduit.c:910
-#: calendar/gui/calendar-conduit.c:1332
-msgid "Error while communicating with calendar server"
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
 msgstr ""
 
-#: calendar/gui/calendar-conduit.c:546
-#, c-format
-msgid "Calendar holds %d entries"
+#: po/tmp/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
+msgid "_Starting date:"
 msgstr ""
 
-#: calendar/gui/calendar-conduit.c:568 calendar/gui/calendar-conduit.c:570
-msgid "Could not start gnomecal server"
+#: po/tmp/event-editor-dialog.glade.h:39
+#, fuzzy
+msgid "day(s)"
+msgstr "DiasRascunhos"
+
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/calendar-conduit.c:598 calendar/gui/calendar-conduit.c:601
-msgid "Could not read pilot's DateBook application block"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:60
-msgid "Specifies the port on which the Pilot is"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:60
-msgid "PORT"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:62
-msgid "If you want to debug the attributes on records"
+#: po/tmp/event-editor-dialog.glade.h:44
+#, fuzzy
+msgid "month(s)"
+msgstr "MЙs"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:64
-msgid "Only syncs from desktop to pilot"
+#: po/tmp/event-editor-dialog.glade.h:46
+#, fuzzy
+msgid "week(s)"
+msgstr "Semanas"
+
+#: po/tmp/event-editor-dialog.glade.h:47
+msgid "year(s)"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:66
-msgid "Only syncs from pilot to desktop"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "_Editar Compromisso"
+
+#: calendar/gui/event-editor.c:407
+#, fuzzy
+msgid "on"
+msgstr "Seg"
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "day"
+msgstr "Hoje"
+
+#: calendar/gui/event-editor.c:559
+#, fuzzy
+msgid "on the"
+msgstr "MЙs"
+
+#: calendar/gui/event-editor.c:566
+#, fuzzy
+msgid "th"
+msgstr "h"
+
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
+msgstr "Apagar todas as ocurrЙncias"
+
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:89
-msgid "Can not create Pilot socket\n"
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:96
-#, c-format
-msgid "Can not bind to device %s\n"
+#: 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/calendar-pilot-sync.c:99
-msgid "Failed to get a connection from the Pilot device"
+#: calendar/gui/getdate.y:394
+#, fuzzy
+msgid "april"
+msgstr "_Correio"
+
+#: calendar/gui/getdate.y:395
+#, fuzzy
+msgid "may"
+msgstr "Dia"
+
+#: calendar/gui/getdate.y:396
+msgid "june"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:102
-msgid "pi_accept failed"
+#: calendar/gui/getdate.y:397
+msgid "july"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:167
-msgid "\tObject did not exist, creating a new one\n"
+#: calendar/gui/getdate.y:398
+msgid "august"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:174
-msgid ""
-"\tObject has been modified on desktop and on the pilot, desktop takes "
-"precedence\n"
+#: calendar/gui/getdate.y:399
+msgid "september"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:475
-msgid "No description"
-msgstr "Nenhuma descriГЦo"
+#: 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
+#, 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 ""
+
+#: calendar/gui/getdate.y:409
+msgid "wednes"
+msgstr ""
+
+#: calendar/gui/getdate.y:410
+msgid "thursday"
+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"
+msgstr ""
+
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
+#, fuzzy
+msgid "year"
+msgstr "Ano"
+
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
+#, 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/calendar-pilot-sync.c:547
-msgid "Syncing with the pilot..."
-msgstr "Sincronizando com o pilot..."
+#: 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"
+
+#: calendar/gui/getdate.y:442
+msgid "first"
+msgstr ""
+
+#. { N_("second"),		tUNUMBER,	2 },
+#: calendar/gui/getdate.y:444
+#, fuzzy
+msgid "third"
+msgstr "Outro"
+
+#: calendar/gui/getdate.y:445
+#, fuzzy
+msgid "fourth"
+msgstr "Hora"
+
+#: calendar/gui/getdate.y:446
+msgid "fifth"
+msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:554
-msgid "Could not open DatebookDB on the Pilot"
+#: calendar/gui/getdate.y:447
+msgid "sixth"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:555
-msgid "Unable to open DatebookDB"
+#: calendar/gui/getdate.y:448
+msgid "seventh"
 msgstr ""
 
-#: calendar/gui/calendar-pilot-sync.c:617
-msgid "Synced DateBook from Pilot to GnomeCal"
+#: calendar/gui/getdate.y:449
+msgid "eighth"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/getdate.y:450
+#, 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 ""
+
+#: calendar/gui/print.c:288
 msgid "1st"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "2nd"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "3rd"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "4th"
 msgstr ""
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "5th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "6th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "7th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "8th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "9th"
 msgstr ""
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "10th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "11th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "12th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "13th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "14th"
 msgstr ""
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "15th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "16th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "17th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "18th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "19th"
 msgstr ""
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "20th"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "21st"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "22nd"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "23rd"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "24th"
 msgstr ""
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "25th"
 msgstr ""
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "26th"
 msgstr "26╨"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "27th"
 msgstr "27╨"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "28th"
 msgstr "28╨"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "29th"
 msgstr "29╨"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "30th"
 msgstr "30╨"
 
-#: calendar/gui/print.c:271
+#: calendar/gui/print.c:294
 msgid "31st"
 msgstr "31╨"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Su"
 msgstr "Do"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Mo"
 msgstr "Sg"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Tu"
 msgstr "Te"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "We"
 msgstr "Qa"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Th"
 msgstr "Qi"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Fr"
 msgstr "Sx"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Sa"
 msgstr "SА"
 
-#: calendar/gui/print.c:868
-msgid "TODO Items"
-msgstr ""
+#: calendar/gui/print.c:936
+#, fuzzy
+msgid "Tasks"
+msgstr "_Tarefa"
 
 #. Day
-#: calendar/gui/print.c:980
+#: calendar/gui/print.c:1066
 msgid "Current day (%a %b %d %Y)"
 msgstr ""
 
-#: calendar/gui/print.c:1000 calendar/gui/print.c:1014
-#: calendar/gui/print.c:1015
-msgid "%a"
-msgstr ""
-
-#: calendar/gui/print.c:1001 calendar/gui/print.c:1002
-#: calendar/gui/print.c:1016 calendar/gui/print.c:1017
-msgid "%b"
-msgstr "%b"
-
-#: calendar/gui/print.c:1004
-#, c-format
-msgid "Current week (%s %s %d - %s %d %d)"
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+msgid "%a %b %d"
 msgstr ""
 
-#: calendar/gui/print.c:1021
-#, c-format
-msgid "Current week (%s %s %d - %s %s %d %d)"
+#: calendar/gui/print.c:1081
+msgid "%a %d %Y"
 msgstr ""
 
-#: calendar/gui/print.c:1027
-#, c-format
-msgid "Current week (%s %s %d %d - %s %s %d %d)"
-msgstr ""
+#: calendar/gui/print.c:1092
+#, fuzzy, c-format
+msgid "Current week (%s - %s)"
+msgstr "Ano corrente (%Y)"
 
 #. Month
-#: calendar/gui/print.c:1040
-msgid "Current month (%a %Y)"
+#: calendar/gui/print.c:1100
+#, fuzzy
+msgid "Current month (%b %Y)"
 msgstr "MЙs corrente (%a %Y)"
 
 #. Year
-#: calendar/gui/print.c:1047
+#: calendar/gui/print.c:1107
 msgid "Current year (%Y)"
 msgstr "Ano corrente (%Y)"
 
-#: calendar/gui/print.c:1084
+#: calendar/gui/print.c:1144
 msgid "Print Calendar"
 msgstr "Imprimir calendАrio"
 
-#: calendar/gui/print.c:1249
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Prever impressЦo"
 
-#: calendar/gui/e-day-view-time-item.c:391
+#. 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
+msgid "SMTWTFS"
+msgstr ""
+
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
 #, c-format
-msgid "%02i minute divisions"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2248 calendar/gui/e-day-view.c:2255
-#: calendar/gui/e-day-view.c:2264 calendar/gui/e-week-view.c:2625
-#: calendar/gui/e-week-view.c:2632 calendar/gui/e-week-view.c:2641
-msgid "New appointment..."
-msgstr "Novo compromisso"
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
 
-#: calendar/gui/e-day-view.c:2252 calendar/gui/e-day-view.c:2259
-#: calendar/gui/e-week-view.c:2629 calendar/gui/e-week-view.c:2636
-msgid "Edit this appointment..."
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2253 calendar/gui/e-week-view.c:2630
-msgid "Delete this appointment"
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2260 calendar/gui/e-week-view.c:2637
-msgid "Make this appointment movable"
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2261 calendar/gui/e-week-view.c:2638
-msgid "Delete this occurrence"
-msgstr "Apagar esta ocurrЙncia"
+#: camel/camel-movemail.c:146
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr ""
 
-#: calendar/gui/e-day-view.c:2262 calendar/gui/e-week-view.c:2639
-msgid "Delete all occurrences"
-msgstr "Apagar todas as ocurrЙncias"
+#: camel/camel-movemail.c:156
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr ""
 
-#: calendar/gui/goto.c:82
-msgid "Year:"
-msgstr "Ano:"
+#: camel/camel-movemail.c:197
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr ""
 
-#: calendar/gui/goto.c:264
-msgid "Go to date"
+#: camel/camel-movemail.c:243
+#, c-format
+msgid "Error reading mail file: %s"
 msgstr ""
 
-#. Instructions
-#: 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."
+#: camel/camel-movemail.c:254
+#, c-format
+msgid "Error writing mail temp file: %s"
 msgstr ""
 
-#: calendar/gui/goto.c:312
-msgid "Go to today"
+#: camel/camel-movemail.c:272
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:136
-#: calendar/gui/evolution-calendar-control.c:131
-msgid "The URI that the calendar will display"
-msgstr "O URI que o calendАrio mostrarА"
+#: camel/camel-movemail.c:304
+#, c-format
+msgid "Could not create pipe: %s"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:135
-msgid "Create to-do item"
+#: camel/camel-movemail.c:316
+#, c-format
+msgid "Could not fork: %s"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:135
-msgid "Edit to-do item"
+#: camel/camel-movemail.c:354
+#, c-format
+msgid "Movemail program failed: %s"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:169
-msgid "Summary:"
-msgstr "SumАrio:"
+#: camel/camel-movemail.c:355
+msgid "(Unknown error)"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:179
-msgid "Due Date:"
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:188
-msgid "Priority:"
-msgstr "Prioridade:"
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:204
-msgid "Item Comments:"
+#: camel/camel-remote-store.c:182
+#, c-format
+msgid "%s server %s"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:320
-msgid "Add to-do item..."
+#: camel/camel-remote-store.c:186
+#, c-format
+msgid "%s service for %s on %s"
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:321
-msgid "Edit this item..."
-msgstr "Editar este item..."
+#: camel/camel-remote-store.c:227
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:420
-msgid "Summary"
-msgstr "SumАrio"
+#: camel/camel-remote-store.c:228
+msgid "(unknown host)"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:421 calendar/gui/prop.c:604
-msgid "Due Date"
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
 msgstr ""
 
-#: calendar/gui/gncal-todo.c:422 calendar/gui/prop.c:605
-#: mail/message-list.c:586
-msgid "Priority"
-msgstr "Prioridade"
+#: camel/camel-service.c:120
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:423
-msgid "Time Left"
+#: camel/camel-service.c:129
+#, c-format
+msgid "URL '%s' needs a host component"
 msgstr ""
 
-#. Label
-#: calendar/gui/gncal-todo.c:435
-#, fuzzy
-msgid "To-do list"
-msgstr "_Ferramentas"
+#: camel/camel-service.c:138
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr ""
 
-#. Add
-#: calendar/gui/gncal-todo.c:474
-msgid "Add..."
-msgstr "Adicionar..."
+#: camel/camel-service.c:488
+#, c-format
+msgid "No such host %s."
+msgstr ""
 
-#. Edit
-#: calendar/gui/gncal-todo.c:483
-msgid "Edit..."
-msgstr "Editar..."
+#: camel/camel-service.c:491
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:707
-msgid "Weeks"
-msgstr "Semanas"
+#: camel/camel-session.c:272
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:708 calendar/gui/gncal-todo.c:712
-msgid "Days"
-msgstr "DiasRascunhos"
+#: camel/camel-session.c:360
+#, c-format
+msgid ""
+"Could not create directory %s:\n"
+"%s"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
-msgid "Hours"
-msgstr "Horas"
+#: camel/camel-url.c:78
+#, c-format
+msgid "URL string `%s' contains no protocol"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:713 calendar/gui/gncal-todo.c:717
-msgid "Hour"
-msgstr "Hora"
+#: camel/camel-url.c:93
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
-msgid "Minutes"
-msgstr "Minutos"
+#: camel/camel-url.c:154
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:718 calendar/gui/gncal-todo.c:722
-msgid "Minute"
-msgstr "Minuto"
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
-msgid "Seconds"
-msgstr "Segundos"
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:723 calendar/gui/gncal-todo.c:727
-msgid "Second"
-msgstr "Segundo"
+#: camel/providers/imap/camel-imap-command.c:216
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr ""
 
-#: calendar/gui/gnome-cal.c:442 calendar/gui/gnome-cal.c:1081
-#: calendar/gui/gnome-cal.c:1137
-msgid "Reminder of your appointment at "
+#: camel/providers/imap/camel-imap-command.c:224
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+msgid "Unknown error"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1073
+#: camel/providers/imap/camel-imap-command.c:407
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:443
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:216
+#, c-format
+msgid "Could not load summary for %s"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-folder.c:586
+msgid "Could not find message body in FETCH response."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-provider.c:41
+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 "Snooze"
-msgstr "Tamanho"
+msgid "Password"
+msgstr "Esquecer _Senhas"
 
-#. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1086 calendar/gui/gnome-cal.c:1141
-msgid "Ok"
-msgstr "Ok"
+#: camel/providers/imap/camel-imap-store.c:236
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Dom"
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Seg"
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Ter"
+#: camel/providers/imap/camel-imap-store.c:333
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Qua"
+#: camel/providers/imap/camel-imap-store.c:359
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Qui"
+#: camel/providers/imap/camel-imap-store.c:539
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Sex"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr ""
 
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "SАb"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
 
-#: calendar/gui/prop.c:330
-msgid "Time display"
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
 msgstr ""
 
-#. Time format
-#: calendar/gui/prop.c:334
-msgid "Time format"
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
 msgstr ""
 
-#: calendar/gui/prop.c:335
-msgid "12-hour (AM/PM)"
-msgstr "12 horas (AM/PM)"
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
 
-#: calendar/gui/prop.c:336
-msgid "24-hour"
-msgstr "24 horas"
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
 
-#. Weeks start on
-#: calendar/gui/prop.c:346
-msgid "Weeks start on"
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: calendar/gui/prop.c:347
-msgid "Sunday"
-msgstr "Domingo"
+#: camel/providers/local/camel-local-store.c:129
+#, c-format
+msgid "Store root %s is not a regular directory"
+msgstr ""
 
-#: calendar/gui/prop.c:348
-msgid "Monday"
-msgstr "Segunda-feira"
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr ""
 
-#. Day range
-#: calendar/gui/prop.c:358
-msgid "Day range"
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:369
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
 
-#: calendar/gui/prop.c:385
-msgid "Day start:"
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
 msgstr ""
 
-#: calendar/gui/prop.c:396
-msgid "Day end:"
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/prop.c:519
-msgid "Colors for display"
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
+#, c-format
+msgid "Folder `%s' does not exist."
 msgstr ""
 
-#: calendar/gui/prop.c:522
-msgid "Colors"
-msgstr "Cores"
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
 
-#: calendar/gui/prop.c:599
-msgid "Show on TODO List:"
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
 msgstr ""
 
-#: calendar/gui/prop.c:606
-msgid "Time Until Due"
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
 msgstr ""
 
-#: calendar/gui/prop.c:637
-msgid "To Do List style options:"
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
 msgstr ""
 
-#: calendar/gui/prop.c:642
-msgid "Highlight overdue items"
+#: camel/providers/local/camel-mbox-folder.c:195
+#, 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
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
 msgstr ""
 
-#: calendar/gui/prop.c:645
-msgid "Highlight not yet due items"
+#: camel/providers/local/camel-mbox-folder.c:327
+#: camel/providers/local/camel-mbox-folder.c:357
+#: camel/providers/local/camel-mbox-folder.c:368
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
 msgstr ""
 
-#: calendar/gui/prop.c:648
-msgid "Highlight items due today"
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
 msgstr ""
 
-#: calendar/gui/prop.c:678
-#, fuzzy
-msgid "To Do List Properties"
-msgstr "Propriedades"
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
 
-#: calendar/gui/prop.c:681
-msgid "To Do List"
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/prop.c:780
-msgid "Alarms"
-msgstr "Alarmes"
+#: camel/providers/local/camel-mbox-store.c:117
+#, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr ""
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:783
-msgid "Alarm Properties"
-msgstr "Propriedades do alarme"
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
+#, c-format
+msgid "`%s' is not a regular file."
+msgstr ""
 
-#: calendar/gui/prop.c:793
-msgid "Beep on display alarms"
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
 msgstr ""
 
-#: calendar/gui/prop.c:803
-msgid "Audio alarms timeout after"
+#: camel/providers/local/camel-mbox-store.c:160
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
 msgstr ""
 
-#: calendar/gui/prop.c:814 calendar/gui/prop.c:831
-msgid " seconds"
-msgstr " segundos"
+#: camel/providers/local/camel-mbox-summary.c:234
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
 
-#: calendar/gui/prop.c:820
-msgid "Enable snoozing for "
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/prop.c:836
-msgid "Defaults"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, c-format
+msgid "Cannot summarise folder: %s: %s"
 msgstr ""
 
-#: calendar/gui/todo-conduit-control-applet.c:112
-msgid "Gpilotd todo conduit"
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
 
-#: calendar/gui/todo-conduit-control-applet.c:113
-msgid "(C) 1998 the Free Software Foundation"
-msgstr "(C) 1998 Free Software Foundation"
+#: camel/providers/local/camel-mbox-summary.c:491
+#, fuzzy, c-format
+msgid "Cannot open temporary mailbox: %s"
+msgstr "NЦo consigo abrir a localizaГЦo: %s"
 
-#: calendar/gui/todo-conduit-control-applet.c:115
-msgid "Configuration utility for the todo conduit.\n"
+#: 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
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: calendar/gui/todo-conduit-control-applet.c:116
-msgid "gnome-unknown.xpm"
-msgstr "gnome-unknown.xpm"
+#: camel/providers/local/camel-mbox-summary.c:562
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
 
-#: calendar/gui/todo-conduit-control-applet.c:141
-msgid "Enabled"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:181
-msgid "Alarm on %A %b %d %Y %H:%M"
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
+#, c-format
+msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:188
-msgid "Notification about your appointment on %A %b %d %Y %H:%M"
+#: camel/providers/local/camel-mbox-summary.c:604
+#, c-format
+msgid "Could not close temp folder: %s"
 msgstr ""
 
-#: calendar/gui/event-editor.c:289
-msgid "Edit Appointment"
-msgstr "_Editar Compromisso"
+#: camel/providers/local/camel-mbox-summary.c:615
+#, c-format
+msgid "Could not rename folder: %s"
+msgstr ""
 
-#: calendar/gui/event-editor.c:294
-msgid "No summary"
-msgstr "Nenhum sumАrio"
+#: camel/providers/local/camel-mbox-summary.c:817
+#, c-format
+msgid "Unknown error: %s"
+msgstr ""
 
-#: calendar/gui/event-editor.c:298
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, c-format
-msgid "Appointment - %s"
-msgstr "Compromisso - %s"
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr ""
 
-#: calendar/gui/event-editor.c:301
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
-msgid "Task - %s"
-msgstr "Tarefa - %s"
+msgid "`%s' is not a directory."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
 
-#: calendar/gui/event-editor.c:304
+#: 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:144
 #, fuzzy, c-format
-msgid "Journal entry - %s"
-msgstr "_Entrada diАria?"
+msgid "Message %s not found."
+msgstr "Ficheiro nЦo encontrado"
 
-#. Owner, summary
-#: calendar/gui/event-editor.c:594 calendar/gui/event-editor.c:688
-msgid "?"
-msgstr "?"
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1215
-msgid "FIXME: Ca_lendar..."
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1250
-msgid "FIXME: Chec_k Names"
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1251
-msgid "FIXME: Address _Book..."
+#: camel/providers/nntp/camel-nntp-provider.c:38
+msgid "USENET news"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1258
-#, fuzzy
-msgid "FIXME: _New Appointment"
-msgstr "_Compromisso"
+#: camel/providers/nntp/camel-nntp-provider.c:40
+msgid "This is a provider for reading from and posting toUSENET newsgroups."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1260
-msgid "FIXME: Rec_urrence..."
+#: camel/providers/nntp/camel-nntp-store.c:226
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1262
-msgid "FIXME: Intive _Attendees..."
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1263
-msgid "FIXME: C_ancel Invitation..."
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: calendar/gui/event-editor.c:1265
-msgid "FIXME: Forward as v_Calendar"
+#: camel/providers/pop3/camel-pop3-folder.c:179
+msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: calendar/gui/event-editor.c:1745
-msgid "%a %b %d %Y"
+#: camel/providers/pop3/camel-pop3-folder.c:273
+#, c-format
+msgid "No message with uid %s"
 msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:183 composer/e-msg-composer.c:690
-msgid "Cut"
-msgstr "Cortar"
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:184
-msgid "Cut selected item into clipboard"
-msgstr "Cortar item seleccionado para a Аrea de transferЙncia"
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:187 composer/e-msg-composer.c:691
-msgid "Copy"
-msgstr "Copiar"
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:188
-msgid "Copy selected item into clipboard"
-msgstr "Copiar item seleccionada para a Аrea de transferЙncia"
+#: camel/providers/pop3/camel-pop3-store.c:150
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199 composer/e-msg-composer.c:692
-msgid "Paste"
-msgstr "Colar"
+#: camel/providers/pop3/camel-pop3-store.c:160
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:192
-#: composer/e-msg-composer-address-dialog.c:200
-msgid "Paste item from clipboard"
-msgstr "Colar item da Аrea de transferЙncia"
+#: camel/providers/pop3/camel-pop3-store.c:172
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:528
-msgid "Select recipients' addresses"
-msgstr "Seleccionar o endereГo dos receptores"
+#: camel/providers/pop3/camel-pop3-store.c:217
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:76
+#: camel/providers/pop3/camel-pop3-store.c:335
+#, c-format
+msgid "Could not connect to POP server on %s."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:389
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, 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
+msgid "(Unknown)"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:438
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:446
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:555
+#, c-format
+msgid "No such folder `%s'."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#, fuzzy
+msgid "Sendmail"
+msgstr "Enviar"
+
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, fuzzy, c-format
+msgid "Could not send message: %s"
+msgstr "Criar uma nova mensagem"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+msgid "sendmail"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:30
+msgid "Virtual folder email provider"
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 byte"
 
-#: composer/e-msg-composer-attachment-bar.c:78
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bytes"
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:93
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:299
-msgid "Add attachment"
-msgstr "Adicionar anexo"
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#, fuzzy
+msgid "attachment"
+msgstr "Anexo"
 
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:332
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/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
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Remover"
 
-#: composer/e-msg-composer-attachment-bar.c:363
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Remover items seleccionados da lista de anexos"
 
-#: composer/e-msg-composer-attachment-bar.c:394
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Adicionar anexo..."
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Anexar um ficheiro Ю mensagem"
 
-#: composer/e-msg-composer-hdrs.c:89
+#.
+#. * 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
+#, fuzzy
+msgid "Attachment properties"
+msgstr "Propriedades do alarme"
+
+#: po/tmp/e-msg-composer-attachment.glade.h:8
+#, fuzzy
+msgid "File name:"
+msgstr "Nome completo:"
+
+#: po/tmp/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
+#, fuzzy
+msgid "From:"
+msgstr "De"
+
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Pressione aqui para o livro de endereГos"
 
-#: composer/e-msg-composer-hdrs.c:124
+#: composer/e-msg-composer-hdrs.c:291
+#, 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
 msgid "To:"
 msgstr "Para:"
 
-#: composer/e-msg-composer-hdrs.c:125
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Introduza os receptores da mensagem"
 
-#: composer/e-msg-composer-hdrs.c:129
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:130
+#: composer/e-msg-composer-hdrs.c:301
 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:135
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:136
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -1717,212 +3501,880 @@ msgstr ""
 "Entre os endereГos que irЦo receber uma cСpia da mensagem sem conhecimento "
 "do receptor"
 
-#: composer/e-msg-composer-hdrs.c:142
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: composer/e-msg-composer-hdrs.c:143
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Introduza o assunto da carta"
 
-#: composer/e-msg-composer.c:492
+#: composer/e-msg-composer.c:429
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:599
+#, fuzzy
+msgid "Save as..."
+msgstr "Gravar como VCard"
+
+#: composer/e-msg-composer.c:610
+#, fuzzy, c-format
+msgid "Error saving file: %s"
+msgstr "Erro a gravar os atalhos."
+
+#: composer/e-msg-composer.c:630
+#, c-format
+msgid "Error loading file: %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:652
+#, fuzzy
+msgid "Saving changes to message..."
+msgstr "Enviar uma nova mensagem"
+
+#: composer/e-msg-composer.c:654
+#, fuzzy
+msgid "Save changes to message..."
+msgstr "Enviar uma nova mensagem"
+
+#: composer/e-msg-composer.c:695
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:745
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
+
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Abrir ficheiro"
 
-#: composer/e-msg-composer.c:502
+#: composer/e-msg-composer.c:893
+msgid "That file does not exist."
+msgstr ""
+
+#: composer/e-msg-composer.c:903
+msgid "That is not a regular file."
+msgstr ""
+
+#: composer/e-msg-composer.c:913
+msgid "That file exists but is not readable."
+msgstr ""
+
+#: composer/e-msg-composer.c:923
+msgid "That file appeared accesible but open(2) failed."
+msgstr ""
+
+#: composer/e-msg-composer.c:945
+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
+msgid "An error occurred while reading the file."
+msgstr ""
+
+#: composer/e-msg-composer.c:1343
+msgid "Compose a message"
+msgstr "Criar uma nova mensagem"
+
+#: composer/e-msg-composer.c:1420
+msgid "Could not create composer window."
+msgstr ""
+
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: filter/e-search-bar.c:176
+msgid "Sear_ch"
+msgstr ""
+
+#: filter/filter-datespec.c:62
+#, fuzzy
+msgid "years"
+msgstr "Ano"
+
+#: filter/filter-datespec.c:63
+#, fuzzy
+msgid "months"
+msgstr "MЙs"
+
+#: filter/filter-datespec.c:64
+#, fuzzy
+msgid "weeks"
+msgstr "Semanas"
+
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "days"
+msgstr "DiasRascunhos"
+
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "hours"
+msgstr "Horas"
+
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "minutes"
+msgstr "Minutos"
+
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "seconds"
+msgstr " segundos"
+
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
+msgid ""
+"The message's date will be compared against\n"
+"whatever the time is when the filter is run\n"
+"or vfolder is opened."
+msgstr ""
+
+#: filter/filter-datespec.c:282
+msgid ""
+"The message's date will be compared against\n"
+"the time that you specify here."
+msgstr ""
+
+#: filter/filter-datespec.c:322
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when the filter is run;\n"
+"\"a week ago\", for example."
+msgstr ""
+
+#. keep in sync with FilterDatespec_type!
+#: filter/filter-datespec.c:357
+msgid "the current time"
+msgstr ""
+
+#: filter/filter-datespec.c:357
+msgid "a time you specify"
+msgstr ""
+
+#: filter/filter-datespec.c:358
+msgid "a time relative to the current time"
+msgstr ""
+
+#. The label
+#: filter/filter-datespec.c:416
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter-datespec.c:690
+msgid "<click here to select a date>"
+msgstr ""
+
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
+msgid "Add Filter Rule"
+msgstr ""
+
+#: filter/filter-editor.c:233
+msgid "Edit Filter Rule"
+msgstr ""
+
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+msgid "Edit Filters"
+msgstr ""
+
+#. and now for the action area
+#: filter/filter-filter.c:401
+#, fuzzy
+msgid "Then"
+msgstr "Qi"
+
+#: filter/filter-filter.c:414
+#, fuzzy
+msgid "Add action"
+msgstr "_AcГУes"
+
+#: filter/filter-filter.c:420
+#, fuzzy
+msgid "Remove action"
+msgstr "Remover grupo"
+
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#, fuzzy
+msgid "Select Folder"
+msgstr "_Nova pasta"
+
+#: filter/filter-folder.c:243
+msgid "Enter folder URI"
+msgstr ""
+
+#: filter/filter-folder.c:289
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: filter/filter-input.c:184
 #, c-format
-msgid "Error loading file: %s"
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
 msgstr ""
 
-#: composer/e-msg-composer.c:543
-msgid "Discard this message?"
-msgstr "Descartar esta mensagem?"
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
 
-#: composer/e-msg-composer.c:648
-msgid "Save in _folder..."
-msgstr "Gravar na _pasta..."
+#: filter/filter-part.c:456
+msgid "Test"
+msgstr ""
 
-#: composer/e-msg-composer.c:648
-msgid "Save the message in a specified folder"
-msgstr "Gravar a mensagem na pasta especificada"
+#: filter/filter-rule.c:520
+#, fuzzy
+msgid "Rule name: "
+msgstr "Nome completo:"
 
-#: composer/e-msg-composer.c:651 composer/e-msg-composer.c:688
-#: mail/folder-browser-factory.c:36
-msgid "Send"
-msgstr "Enviar"
+#: filter/filter-rule.c:524
+#, fuzzy
+msgid "Untitled"
+msgstr "(Sem tМtulo)"
 
-#: composer/e-msg-composer.c:651
-msgid "Send the message"
-msgstr "Enviar a mensagem"
+#: filter/filter-rule.c:540
+msgid "If"
+msgstr ""
 
-#: composer/e-msg-composer.c:659
-msgid "View _attachments"
-msgstr "Ver _anexos"
+#: filter/filter-rule.c:557
+msgid "Execute actions"
+msgstr ""
 
-#: composer/e-msg-composer.c:659
-msgid "View/hide attachments"
-msgstr "Ver/esconder anexos"
+#: filter/filter-rule.c:561
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:566
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:577
+msgid "Add criterion"
+msgstr ""
+
+#: filter/filter-rule.c:583
+#, 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"
+msgstr ""
+
+#: po/tmp/filter.glade.h:10
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "_Pastas"
 
-#: composer/e-msg-composer.c:688
-msgid "Send this message"
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr ""
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr ""
+
+#: po/tmp/filter.glade.h:15
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "_Pastas"
+
+#: po/tmp/filter.glade.h:16
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "Adicionar Fonte"
+
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Colour"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:4
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "Ir para a _pasta..."
+
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Date received"
+msgstr "Receber"
+
+#: filter/libfilter-i18n.h:6
+#, 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"
 
-#: composer/e-msg-composer.c:690
-msgid "Cut selected region into the clipboard"
-msgstr "Cortar a regiЦo seleccionada para a Аrea de transferЙncia"
+#: filter/libfilter-i18n.h:10
+#, fuzzy
+msgid "Message Body"
+msgstr "SituaГЦo das mensagens"
 
-#: composer/e-msg-composer.c:691
-msgid "Copy selected region into the clipboard"
-msgstr "Copiar a regiЦo seleccionada para a Аrea de transferЙncia"
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "SituaГЦo das mensagens"
 
-#: composer/e-msg-composer.c:692
-msgid "Paste selected region into the clipboard"
-msgstr "Colar a regiЦo seleccionada para a Аrea de transferЙncia"
+#: filter/libfilter-i18n.h:12
+msgid "Message was received"
+msgstr ""
 
-#: composer/e-msg-composer.c:693
-msgid "Undo"
-msgstr "Anular"
+#: filter/libfilter-i18n.h:13
+#, fuzzy
+msgid "Message was sent"
+msgstr "SituaГЦo das mensagens"
 
-#: composer/e-msg-composer.c:693
-msgid "Undo last operation"
-msgstr "Anular a Зltima operaГЦo"
+#: filter/libfilter-i18n.h:14
+#, fuzzy
+msgid "Move to Folder"
+msgstr "Ir para a _pasta..."
 
-#: composer/e-msg-composer.c:695
-msgid "Attach"
-msgstr "Anexar"
+#: filter/libfilter-i18n.h:16
+msgid "Recipients"
+msgstr ""
 
-#: composer/e-msg-composer.c:695
-msgid "Attach a file"
-msgstr "Anexar um ficheiro"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
 
-#: composer/e-msg-composer.c:857
-msgid "Compose a message"
-msgstr "Criar uma nova mensagem"
+#: filter/libfilter-i18n.h:18
+#, fuzzy
+msgid "Sender"
+msgstr "Enviar"
+
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "SituaГЦo online"
 
-#: mail/folder-browser-factory.c:35
-msgid "Get mail"
+#: filter/libfilter-i18n.h:20
+#, fuzzy
+msgid "Source"
+msgstr "Fontes"
+
+#: filter/libfilter-i18n.h:21
+msgid "Specific header"
 msgstr ""
 
-#: mail/folder-browser-factory.c:35
-msgid "Check for new mail"
-msgstr "Verificar novo correio"
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "SАb"
 
-#: mail/folder-browser-factory.c:36
-msgid "Send a new message"
-msgstr "Enviar uma nova mensagem"
+#: filter/libfilter-i18n.h:23
+msgid "Stop Processing"
+msgstr ""
 
-#: mail/folder-browser-factory.c:37
-msgid "Find messages"
-msgstr "Encontrar mensagens"
+#: filter/libfilter-i18n.h:24
+msgid "Subject"
+msgstr "Assunto"
 
-#: mail/folder-browser-factory.c:41
-msgid "Reply"
-msgstr "Responder"
+#: filter/libfilter-i18n.h:25
+#, fuzzy
+msgid "after"
+msgstr "Data"
+
+#: filter/libfilter-i18n.h:26
+msgid "before"
+msgstr ""
 
-#: mail/folder-browser-factory.c:41
+#: filter/libfilter-i18n.h:27
 #, fuzzy
-msgid "Reply to the sender of this message"
-msgstr "Responder ao emissor desta mensagem"
+msgid "contains"
+msgstr "_AcГУes"
 
-#: mail/folder-browser-factory.c:42
-msgid "Reply to All"
+#: filter/libfilter-i18n.h:28
+msgid "does not contain"
+msgstr ""
+
+#: filter/libfilter-i18n.h:29
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30
+msgid "does not exist"
+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"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+msgid "exists"
+msgstr ""
+
+#: filter/libfilter-i18n.h:35
+msgid "is greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+msgid "is"
+msgstr ""
+
+#: filter/libfilter-i18n.h:39
+msgid "on or after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:40
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "was after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "was before"
+msgstr ""
+
+#: filter/score-editor.c:127
+#, fuzzy
+msgid "Add Rule"
+msgstr "Adicionar Fonte"
+
+#: filter/score-editor.c:166
+msgid "Edit Score Rule"
+msgstr ""
+
+#: filter/score-rule.c:192 filter/score-rule.c:194
+#, fuzzy
+msgid "Score"
+msgstr "Fontes"
+
+#: filter/vfolder-editor.c:155
+msgid "Add VFolder Rule"
+msgstr ""
+
+#: filter/vfolder-editor.c:204
+msgid "Edit VFolder Rule"
+msgstr ""
+
+#: mail/component-factory.c:227
+msgid "Cannot initialize Evolution's mail component."
+msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+
+#: mail/component-factory.c:266
+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
+#, fuzzy
+msgid "Save"
+msgstr "SА"
+
+#: mail/folder-browser.c:153
+msgid "Body or subject contains"
+msgstr ""
+
+#: mail/folder-browser.c:154
+msgid "Body contains"
+msgstr ""
+
+#: mail/folder-browser.c:155
+#, fuzzy
+msgid "Subject contains"
+msgstr "Assunto"
+
+#: mail/folder-browser.c:156
+msgid "Body does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:157
+msgid "Subject does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:458
+#, fuzzy
+msgid "Filter on Sender"
+msgstr "Ficheiro nЦo encontrado"
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "_Abrir"
+
+#: mail/folder-browser.c:466
+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
+msgid "Print"
+msgstr "Imprimir"
+
+#: mail/folder-browser.c:469
+#, fuzzy
+msgid "Reply to Sender"
 msgstr "Reponder para todos"
 
-#: mail/folder-browser-factory.c:42
-msgid "Reply to all recipients of this message"
-msgstr "Reponder a todos receptores da mensagem"
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
+msgid "Reply to All"
+msgstr "Reponder para todos"
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr ""
 
-#: mail/folder-browser-factory.c:44
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+msgid "Forward inline"
+msgstr ""
+
+#: mail/folder-browser.c:474
+msgid "Mark as Read"
+msgstr ""
+
+#: mail/folder-browser.c:475
+msgid "Mark as Unread"
+msgstr ""
+
+#: mail/folder-browser.c:477
 #, fuzzy
-msgid "Forward this message"
-msgstr "Enviar esta mensagem"
+msgid "Move to Folder..."
+msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser-factory.c:48
+#: mail/folder-browser.c:478
 #, fuzzy
-msgid "Print the selected message"
-msgstr "Imprimir a mensagem seleccionada"
+msgid "Copy to Folder..."
+msgstr "Ir para a _pasta..."
 
-#: mail/folder-browser-factory.c:50
+#: mail/folder-browser.c:480
 #, fuzzy
-msgid "Delete this message"
-msgstr "Enviar esta mensagem"
+msgid "Undelete"
+msgstr "Apagar"
 
-#: mail/folder-browser-factory.c:69
-msgid "_Expunge"
+#. { _("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
+msgid "Apply Filters"
+msgstr ""
+
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#, fuzzy
+msgid "Create Rule From Message"
+msgstr "Mensagens de correio em rascunho"
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
 msgstr ""
 
-#: mail/folder-browser-factory.c:75
-msgid "_Filter Druid ..."
-msgstr "DruМda dos _filtros"
+#: mail/mail-autofilter.c:71
+#, fuzzy, c-format
+msgid "Mail to %s"
+msgstr "Fontes de correio"
+
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Assunto"
 
-#: mail/folder-browser-factory.c:81
-msgid "_Virtual Folder Druid ..."
+#: mail/mail-autofilter.c:230
+#, c-format
+msgid "Mail from %s"
 msgstr ""
 
-#: mail/folder-browser-factory.c:87
-msgid "_Mail Configuration ..."
-msgstr "ConfiguraГЦo do co_rreio..."
+#: mail/mail-autofilter.c:331
+#, c-format
+msgid "%s mailing list"
+msgstr ""
 
-#: mail/folder-browser-factory.c:93
-msgid "Forget _Passwords"
-msgstr "Esquecer _Senhas"
+#: mail/mail-callbacks.c:74
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
 
-#: mail/mail-config.c:258
+#: mail/mail-callbacks.c:114
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:128
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+msgid "You have no mail sources configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:213
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:222
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:246
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
+msgid "Move message(s) to"
+msgstr ""
+
+#: mail/mail-callbacks.c:554
+#, fuzzy
+msgid "Copy message(s) to"
+msgstr "Criar uma nova mensagem"
+
+#: mail/mail-callbacks.c:665
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+
+#: mail/mail-callbacks.c:748
+msgid "Save Message As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:750
+msgid "Save Messages As..."
+msgstr ""
+
+#: mail/mail-callbacks.c:877
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-callbacks.c:922
+#, fuzzy
+msgid "Print Message"
+msgstr "Encontrar mensagens"
+
+#: mail/mail-callbacks.c:969
+msgid "Printing of message failed"
+msgstr ""
+
+#.
+#. * 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
+msgid "Identity"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "ConfiguraГЦo do correio"
+
+#: po/tmp/mail-config-druid.glade.h:8
+#, fuzzy
+msgid "Mail Source"
+msgstr "atalhos principais"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Transporte de correio"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config.c:273
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Nome completo:"
 
-#: mail/mail-config.c:301
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "EndereГo de correio:"
 
-#: mail/mail-config.c:324
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "OrganizaГЦo:"
 
-#: mail/mail-config.c:336
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Ficheiro com assinatura:"
 
-#: mail/mail-config.c:341
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr ""
 
-#: mail/mail-config.c:698 mail/mail-config.c:789
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Servidor:"
 
-#: mail/mail-config.c:704
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Utilizador:"
 
-#: mail/mail-config.c:710
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Caminho"
 
-#: mail/mail-config.c:716 mail/mail-config.c:795
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "AutenticaГЦo"
 
-#: mail/mail-config.c:728 mail/mail-config.c:807
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr ""
 
-#: mail/mail-config.c:754 mail/mail-config.c:829
-msgid "Test these values before continuing"
+#: mail/mail-config-gui.c:968
+msgid "Remember this password"
 msgstr ""
 
-#: mail/mail-config.c:936
+#: mail/mail-config-gui.c:991
+msgid "Don't delete messages from server"
+msgstr ""
+
+#: mail/mail-config-gui.c:1003
+msgid "Test Settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:1130
+#, fuzzy
+msgid "Mail source type:"
+msgstr "Fontes de correio"
+
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -1931,173 +4383,812 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config.c:954
-msgid "Select the method you would like to use to deliver your mail."
+#: mail/mail-config-gui.c:1154
+msgid "News source type:"
 msgstr ""
 
-#: mail/mail-config.c:1128 mail/mail-config.c:1207
-msgid "Mail Configuration"
-msgstr "ConfiguraГЦo do correio"
-
-#. Identity page
-#: mail/mail-config.c:1145 mail/mail-config.c:1874
-msgid "Identity"
+#: mail/mail-config-gui.c:1159
+msgid ""
+"Select the kind of news server you have, and enter the relevant information "
+"about it.\n"
+"\n"
+"If the server requires authentication, you can click the \"Detect supported "
+"types...\" button after entering the other information."
 msgstr ""
 
-#. Source page
-#: mail/mail-config.c:1164
+#: mail/mail-config-gui.c:1178
 #, fuzzy
-msgid "Mail Source"
-msgstr "atalhos principais"
-
-#. Transport page
-#: mail/mail-config.c:1185
-msgid "Mail Transport"
+msgid "Mail transport type:"
 msgstr "Transporte de correio"
 
-#: mail/mail-config.c:1307
-msgid "Edit Identity"
-msgstr ""
-
-#: mail/mail-config.c:1309
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config.c:1452
-msgid "Edit Source"
+#: mail/mail-config-gui.c:1235
+msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config.c:1454
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Adicionar Fonte"
 
-#: mail/mail-config.c:1716
-msgid "Name"
-msgstr "Nome"
+#: mail/mail-config-gui.c:1335
+msgid "Edit Source"
+msgstr ""
 
-#: mail/mail-config.c:1716
-msgid "Address"
-msgstr "EndereГo"
+#: mail/mail-config-gui.c:1430
+#, fuzzy
+msgid "Add News Server"
+msgstr "Adicionar novo grupo"
 
-#: mail/mail-config.c:1716
-msgid "Organization"
-msgstr "OrganizaГЦo"
+#: mail/mail-config-gui.c:1432
+msgid "Edit News Server"
+msgstr ""
 
-#: mail/mail-config.c:1716
-msgid "Signature file"
+#: mail/mail-config-gui.c:2253
+#, c-format
+msgid "Testing \"%s\""
 msgstr ""
 
-#: mail/mail-config.c:1742
-msgid "Camel Providers Configuration"
+#: mail/mail-config-gui.c:2255
+#, c-format
+msgid "Test connection to \"%s\""
 msgstr ""
 
-#: mail/mail-config.c:1831
+#: mail/mail-config-gui.c:2296
+msgid "The connection was successful!"
+msgstr ""
+
+#: mail/mail-config-gui.c:2346
+#, c-format
+msgid "Querying authorization capabilities of \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2348
+#, c-format
+msgid "Query authorization at \"%s\""
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:7
+msgid "Address"
+msgstr "EndereГo"
+
+#: po/tmp/mail-config.glade.h:10
 msgid "Identities"
 msgstr ""
 
-#: mail/mail-config.c:1847 mail/mail-config.c:1943
-msgid "Add"
-msgstr "Adicionar"
+#: po/tmp/mail-config.glade.h:11
+#, fuzzy
+msgid "Mail Sources"
+msgstr "atalhos principais"
 
-#: mail/mail-config.c:1856 mail/mail-config.c:1952
-msgid "Edit"
+#: po/tmp/mail-config.glade.h:13
+msgid "Mark message as seen [ms]: "
 msgstr ""
 
-#: mail/mail-config.c:1927
-msgid "Mail sources"
-msgstr "Fontes de correio"
+#: po/tmp/mail-config.glade.h:14
+#, fuzzy
+msgid "News Servers"
+msgstr "Servidor:"
 
-#: mail/mail-config.c:1970
-msgid "Sources"
+#: po/tmp/mail-config.glade.h:15
+#, fuzzy
+msgid "News Sources"
 msgstr "Fontes"
 
-#: mail/mail-config.c:2009
-msgid "Transports"
-msgstr "Transportes"
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "OrganizaГЦo"
 
-#: mail/mail-config.c:2030
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Enviar mensagem em formato HTML"
 
-#: mail/main.c:58
-msgid "Mail Component: I could not initialize Bonobo"
-msgstr "Component de correio: NЦo consegui inicializar Bonobo"
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Fontes"
 
-#: mail/message-list.c:572
-msgid "Online Status"
-msgstr "SituaГЦo online"
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+msgid "Please enter your PGP/GPG passphrase."
+msgstr ""
 
-#: mail/message-list.c:607
-msgid "Subject"
-msgstr "Assunto"
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+msgid "No password provided."
+msgstr ""
 
-#: mail/message-list.c:614
-msgid "Date"
-msgstr "Data"
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
 
-#: mail/message-list.c:621
-msgid "Receive"
-msgstr "Receber"
+#: mail/mail-crypto.c:625
+msgid "No GPG/PGP program available."
+msgstr ""
 
-#: mail/message-list.c:635
-msgid "Size"
-msgstr "Tamanho"
+#: mail/mail-display.c:90
+#, c-format
+msgid ""
+"Could not open file %s:\n"
+"%s"
+msgstr ""
 
-#: mail/component-factory.c:173
-msgid "Cannot initialize Evolution's mail component."
-msgstr "NЦo consigo inicializar o componente de mail do Evolution."
+#: mail/mail-display.c:113
+#, c-format
+msgid "Could not write data: %s"
+msgstr ""
+
+#: mail/mail-display.c:218
+#, fuzzy
+msgid "Save Attachment"
+msgstr "Anexo"
+
+#: mail/mail-display.c:258
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+
+#: mail/mail-display.c:300
+msgid "Save to Disk..."
+msgstr ""
+
+#: mail/mail-display.c:302
+#, c-format
+msgid "Open in %s..."
+msgstr ""
+
+#: mail/mail-display.c:304
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:328
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:351
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:355
+msgid "Hide"
+msgstr ""
+
+#: mail/mail-format.c:500
+#, 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
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+msgid "Encrypted message not displayed"
+msgstr ""
+
+#: mail/mail-format.c:863
+#, fuzzy
+msgid "Encrypted message"
+msgstr "Enviar a mensagem"
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
 
-#: shell/main.c:99
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1486
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:206
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:261
+#, fuzzy
+msgid "Closing current folder"
+msgstr "Fechar o calendАrio corrente"
+
+#: mail/mail-local.c:293
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:314
+#, fuzzy
+msgid "Creating new folder"
+msgstr "Criar um novo calendАrio"
+
+#: mail/mail-local.c:329
+#, fuzzy
+msgid "Copying messages"
+msgstr "Encontrar mensagens"
+
+#: mail/mail-local.c:341
+#, c-format
 msgid ""
-"Hi.  Thanks for taking the time to download this preview release of\n"
-"the Evolution groupware suite.\n"
-"\n"
-"The Evolution team has worked hard to make Evolution as robust,\n"
-"extensible, pretty, fast and well-suited to heavy internet users as\n"
-"possible.  And we're very tired.  But we're not done -- not yet.\n"
-"\n"
-"As you explore Evolution, please understand that most of our work has\n"
-"been focused on the backend engine which drives the entire system and\n"
-"not on the user interface.  We are just cresting the hill now, though,\n"
-"and will be pouring most of our love and attention into the UI from\n"
-"here out.  But at least you know that you're not using demoware.\n"
-"\n"
-"So, time for the nerdy disclaimer.  Evolution will: crash, lose your\n"
-"mail, leave stray processes running, consume 100% CPU, race, lock,\n"
-"send HTML mail to random mailing lists, and embarass you in front of\n"
-"your friends and co-workers.  Use at your own risk.\n"
-"\n"
-"We hope that you enjoy the results of our hard work, and we eagerly\n"
-"await your contributions!\n"
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
 msgstr ""
 
-#: shell/main.c:128
+#: mail/mail-local.c:372
 msgid ""
-"Thanks\n"
-"The Evolution Team\n"
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
 msgstr ""
 
-#: shell/main.c:169
-msgid "Cannot initialize the Evolution shell."
+#: mail/mail-local.c:781
+msgid "Registering local folder"
 msgstr ""
 
-#: shell/main.c:205
-msgid "Cannot initialize the Bonobo component system."
-msgstr "Falhou a inicializaГЦo do sistema de componentes Bonobo."
+#: mail/mail-local.c:783
+msgid "Register local folder"
+msgstr ""
+
+#: mail/mail-ops.c:79
+#, c-format
+msgid "Fetching email from %s"
+msgstr ""
+
+#: mail/mail-ops.c:81
+#, c-format
+msgid "Fetch email from %s"
+msgstr ""
+
+#: mail/mail-ops.c:331
+#, c-format
+msgid "There is no new mail at %s."
+msgstr ""
+
+#: mail/mail-ops.c:401
+msgid "Filtering email on demand"
+msgstr ""
+
+#: mail/mail-ops.c:403
+msgid "Filter email on demand"
+msgstr ""
+
+#: mail/mail-ops.c:538
+#, 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:720
+msgid "Sending queue"
+msgstr ""
+
+#: mail/mail-ops.c:722
+msgid "Send queue"
+msgstr ""
+
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#, c-format
+msgid "Appending \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
+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
+#, c-format
+msgid "Moving messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1003
+#, c-format
+msgid "Copying messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1006
+#, c-format
+msgid "Move messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1008
+#, c-format
+msgid "Copy messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1039
+#, fuzzy
+msgid "Moving"
+msgstr "Seg"
+
+#: mail/mail-ops.c:1042
+#, fuzzy
+msgid "Copying"
+msgstr "Copiar"
+
+#: mail/mail-ops.c:1062
+#, 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
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Synchronizing \"%s\""
+msgstr "Sincronizar"
+
+#: mail/mail-ops.c:1951
+#, fuzzy, c-format
+msgid "Synchronize \"%s\""
+msgstr "Sincronizar"
+
+#: 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: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\""
+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 ""
+
+#: 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:2428
+#, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2431
+#, 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 ""
+
+#: mail/mail-search-dialogue.c:104
+msgid "Cancel"
+msgstr ""
+
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-threads.c:301
+#, c-format
+msgid ""
+"Error while preparing to %s:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:675
+#, c-format
+msgid ""
+"Error while `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:732
+msgid "Error reading commands from dispatching thread."
+msgstr ""
 
-#: shell/e-setup.c:47
+#: mail/mail-threads.c:797
+msgid "Corrupted message from dispatching thread?"
+msgstr ""
+
+#: mail/mail-threads.c:916
+#, fuzzy
+msgid "Could not create dialog box."
+msgstr "NЦo se consegui inicializar Bonobo"
+
+#: mail/mail-threads.c:927
+msgid "User cancelled query."
+msgstr ""
+
+#: mail/mail-tools.c:189
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr ""
+
+#. Get all uids of source
+#: mail/mail-tools.c:239
+#, c-format
+msgid "Examining %s"
+msgstr ""
+
+#: mail/mail-tools.c:269
+#, c-format
+msgid ""
+"Could not read UID cache file \"%s\". You may receive duplicate messages."
+msgstr ""
+
+#. Info
+#: mail/mail-tools.c:290
+#, c-format
+msgid "Retrieving message %d of %d"
+msgstr ""
+
+#. Append it to dest
+#: mail/mail-tools.c:303
+#, c-format
+msgid "Writing message %d of %d"
+msgstr ""
+
+#: mail/mail-tools.c:332
+#, c-format
+msgid "Saving changes to %s"
+msgstr ""
+
+#: mail/mail-tools.c:369
+#, fuzzy, c-format
+msgid "[%s] (forwarded message)"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-tools.c:379
+msgid "Fwd: (no subject)"
+msgstr ""
+
+#: mail/mail-tools.c:418
+#, fuzzy, c-format
+msgid "Forwarded message - %s"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-tools.c:420
+#, fuzzy
+msgid "Forwarded message (no subject)"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-tools.c:523
+#, fuzzy, c-format
+msgid ""
+"Cannot open location `%s':\n"
+"%s"
+msgstr "NЦo consigo abrir a localizaГЦo: %s"
+
+#: mail/mail-vfolder.c:147
+#, fuzzy
+msgid "VFolders"
+msgstr "_Pastas"
+
+#: mail/mail-vfolder.c:296
+#, 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
+msgid "Reply"
+msgstr "Responder"
+
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#, 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
+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
+#, fuzzy
+msgid "Forward this message"
+msgstr "Enviar esta mensagem"
+
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#, fuzzy
+msgid "Print the selected message"
+msgstr "Imprimir a mensagem seleccionada"
+
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+#, fuzzy
+msgid "Delete this message"
+msgstr "Enviar esta mensagem"
+
+#: mail/message-list.c:572
+msgid "Unseen"
+msgstr ""
+
+#: mail/message-list.c:575
+#, fuzzy
+msgid "Seen"
+msgstr "Enviar"
+
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr ""
+
+#: mail/message-list.c:846
+#, 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
+
+#: mail/message-list.c:860 mail/message-list.c:875
+msgid "<unknown>"
+msgstr ""
+
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
+msgstr ""
+
+#: mail/message-list.c:2070
+#, fuzzy
+msgid "Rebuild message view"
+msgstr "Encontrar mensagens"
+
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:172
+#, c-format
+msgid "Getting store for \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:282
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:290
+#, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr ""
+
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "InstalaГЦo do Evolution"
 
-#: shell/e-setup.c:51
+#: shell/e-setup.c:116
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
+msgstr ""
+
+#: shell/e-setup.c:117
+#, fuzzy
+msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
+msgstr ""
+"Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
+"em"
+
+#: shell/e-setup.c:155
+msgid "Could not update files correctly"
+msgstr ""
+
+#: shell/e-setup.c:158 shell/e-setup.c:224
+msgid "Evolution files successfully installed."
+msgstr "Ficheiros do Evolution instalados com sucesso"
+
+#: shell/e-setup.c:187
 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:52
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
-msgstr "Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution em"
+msgstr ""
+"Carregue em \\\"OK\\\" para instalar os ficheiros de utilizador do Evolution "
+"em"
 
-#: shell/e-setup.c:69
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -2105,327 +5196,1698 @@ msgid ""
 "Error: %s"
 msgstr ""
 
-#: shell/e-setup.c:84
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:88
-msgid "Evolution files successfully installed."
-msgstr "Ficheiros do Evolution instalados com sucesso"
-
-#: shell/e-setup.c:108
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
-"Please remove it in order to allow installation\n"
+"Please move it in order to allow installation\n"
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-shell-view.c:112
+#: shell/e-setup.c:257
+#, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:82
+#, fuzzy, c-format
+msgid ""
+"Cannot create the specified folder:\n"
+"%s"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: shell/e-shell-folder-creation-dialog.c:134
+msgid "The specified folder name is not valid."
+msgstr ""
+
+#: shell/e-shell-folder-creation-dialog.c:225
+#, fuzzy
+msgid "Evolution - Create new folder"
+msgstr "O Evolution nЦo consegue criar as suas pastas locais"
+
+#: shell/e-shell-folder-selection-dialog.c:96
+msgid ""
+"The type of the selected folder is not valid for\n"
+"the requested operation."
+msgstr ""
+
+#: shell/e-shell-folder-selection-dialog.c:291
+#, fuzzy
+msgid "New..."
+msgstr "Novo"
+
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
+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
+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
+msgid "Bug buddy could not be run."
+msgstr "NЦo consegui correr o Bub buddy"
+
+#: shell/e-shell-view-menu.c:172
+msgid "Copyright 1999, 2000 Helix Code, Inc."
+msgstr "Copyright 1999, 2000 Helix Code, Inc."
+
+#: shell/e-shell-view-menu.c:174
+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
+msgid "Go to folder..."
+msgstr "Ir para a _pasta..."
+
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Nenhuma pasta mostrada)"
 
-#: shell/e-shell-view.c:207
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "_Pastas"
 
-#: shell/e-shell-view.c:575
-msgid "None"
-msgstr "Nenhuma"
-
-#: shell/e-shell-view.c:579
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:647
+#: shell/e-shell.c:372
 #, c-format
-msgid "Cannot open location: %s"
-msgstr "NЦo consigo abrir a localizaГЦo: %s"
+msgid "Cannot set up local storage -- %s"
+msgstr ""
 
-#: shell/e-shell.c:250
+#: shell/e-shell.c:1208
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
 msgstr ""
 
-#: shell/e-shell-folder-title-bar.c:353
-msgid "(Untitled)"
-msgstr "(Sem tМtulo)"
+#: shell/e-shortcuts-view.c:122
+#, fuzzy
+msgid "Create new shortcut group"
+msgstr "Criar um novo contacto"
 
-#: shell/e-shortcut.c:469
-msgid "New group"
-msgstr "Novo grupo"
+#: shell/e-shortcuts-view.c:125
+#, fuzzy
+msgid "Group name:"
+msgstr "Nome completo:"
 
-#: shell/e-shortcuts-view.c:235
-msgid "_Small icons"
+#: shell/e-shortcuts-view.c:234
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:239
+msgid "Don't remove"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:250
+#, fuzzy
+msgid "_Small Icons"
 msgstr "мcone_s pequenos"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:251
 msgid "Show the shortcuts as small icons"
 msgstr ""
 
-#: shell/e-shortcuts-view.c:238
-msgid "_Large icons"
+#: shell/e-shortcuts-view.c:253
+#, fuzzy
+msgid "_Large Icons"
 msgstr "мcones _grandes"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar atalhos co Мcones grandes"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:265
+#, fuzzy
+msgid "_New Group..."
+msgstr "Novo grupo"
+
+#: shell/e-shortcuts-view.c:266
+#, fuzzy
+msgid "Create a new shortcut group"
+msgstr "Criar um novo contacto"
+
+#: shell/e-shortcuts-view.c:268
+#, fuzzy
+msgid "_Remove This Group..."
+msgstr "Remover grupo"
+
+#: shell/e-shortcuts-view.c:269
+#, fuzzy
+msgid "Remove this shortcut group"
+msgstr "Remover este atalho da barra de atalhos"
+
+#: shell/e-shortcuts-view.c:353
 msgid "Activate"
 msgstr "Activar"
 
-#: shell/e-shortcuts-view.c:329
+#: shell/e-shortcuts-view.c:353
 msgid "Activate this shortcut"
 msgstr "Activar este atalho"
 
-#: shell/e-shortcuts-view.c:332
+#: shell/e-shortcuts-view.c:356
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Remover este atalho da barra de atalhos"
 
-#. you might have to call gnome_dialog_run() on the
-#. * dialog returned here, I don't remember...
-#.
-#: shell/e-shell-view-menu.c:110
-msgid "Bug buddy was not found in your $PATH."
-msgstr "O Bug buddy nЦo foi encontrado no seu $PATH."
+#: shell/e-shortcuts.c:358
+msgid "Error saving shortcuts."
+msgstr "Erro a gravar os atalhos."
 
-#. same as above
-#: shell/e-shell-view-menu.c:116
-msgid "Bug buddy could not be run."
-msgstr "NЦo consegui correr o Bub buddy"
+#: 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
+#, fuzzy
+msgid "_View"
+msgstr "_Novo"
 
-#: shell/e-shell-view-menu.c:159
-msgid "Evolution"
-msgstr "Evolution"
+#: shell/e-storage-set-view.c:235
+#, fuzzy
+msgid "View the selected folder"
+msgstr "Imprimir a mensagem seleccionada"
 
-#: shell/e-shell-view-menu.c:161
-msgid "Copyright 1999, 2000 Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-storage.c:138
+#, fuzzy
+msgid "(No name)"
+msgstr "Nome"
+
+#: shell/e-storage.c:389
+msgid "No error"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:163
+#: shell/e-storage.c:391
+msgid "Generic error"
+msgstr ""
+
+#: shell/e-storage.c:393
+msgid "A folder with the same name already exists"
+msgstr ""
+
+#: shell/e-storage.c:395
+msgid "The specified folder type is not valid"
+msgstr ""
+
+#: shell/e-storage.c:397
+msgid "I/O error"
+msgstr ""
+
+#: shell/e-storage.c:399
+msgid "Not enough space to create the folder"
+msgstr ""
+
+#: shell/e-storage.c:401
+msgid "The specified folder was not found"
+msgstr ""
+
+#: shell/e-storage.c:403
+msgid "Function not implemented in this storage"
+msgstr ""
+
+#: shell/e-storage.c:405
+msgid "Permission denied"
+msgstr ""
+
+#: shell/e-storage.c:407
+msgid "Operation not supported"
+msgstr ""
+
+#: shell/e-storage.c:409
+msgid "The specified type is not supported in this storage"
+msgstr ""
+
+#: shell/main.c:74
 msgid ""
-"Evolution is a suite of groupware applications\n"
-"for mail, calendaring, and contact management\n"
-"within the GNOME desktop environment."
+"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"
+"Evolution to read their mail full time. You could too. (Just\n"
+"be sure to keep a backup.)\n"
+"\n"
+"But while we have fixed many bugs affecting its stability and\n"
+"security, you still get the disclaimer:  Evolution will: crash,\n"
+"lose your mail when you don't want it to, refuse to delete your\n"
+"mail when you do want it to, leave stray processes running,\n"
+"consume 100% CPU, race, lock, send HTML mail to random mailing\n"
+"lists, and embarass you in front of your friends and co-workers.\n"
+"Use only as directed.\n"
+"\n"
+"We hope that you enjoy the results of our hard work, and we eagerly\n"
+"await your contributions!\n"
 msgstr ""
 
-#: shell/e-shell-view-menu.c:302 shell/e-shell-view-menu.c:399
-msgid "Go to folder..."
-msgstr "Ir para a _pasta..."
+#: shell/main.c:101
+msgid ""
+"Thanks\n"
+"The Evolution Team\n"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:343
-msgid "_Folder"
+#: shell/main.c:132
+msgid "Cannot initialize the Evolution shell."
+msgstr ""
+
+#: shell/main.c:178
+msgid "Disable."
+msgstr ""
+
+#: shell/main.c:198
+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
+msgid "Create a new contact"
+msgstr "Criar um novo contacto"
+
+#: po/tmp/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
+msgid "Find"
+msgstr "Encontrar"
+
+#: po/tmp/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
+msgid "New"
+msgstr "Novo"
+
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
+msgstr "Imprimir contactos"
+
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:16
+msgid "Stop Loading"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:17
+msgid "View All"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "View all contacts"
+msgstr "Encontrar um contacto"
+
+#: po/tmp/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "Imprimir contactos"
+
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+msgid "_Tools"
+msgstr "_Ferramentas"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-calendar.xml.h:6
+msgid "5 Days"
+msgstr "5 Dias"
+
+#: po/tmp/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Alter preferences"
+msgstr "PreferЙncias"
+
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Novo Ca_lendАrio"
+
+#: po/tmp/evolution-calendar.xml.h:9
+#, fuzzy
+msgid "Calendar Preferences..."
+msgstr "PreferЙncias"
+
+#: po/tmp/evolution-calendar.xml.h:10
+msgid "Create a new appointment"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:11
+msgid "Create a new calendar"
+msgstr "Criar um novo calendАrio"
+
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr "Dia"
+
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:15
+msgid "Go to"
+msgstr "Ir para"
+
+#: po/tmp/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
+msgid "Go to present time"
+msgstr ""
+
+#: po/tmp/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
+msgid "Next"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:21
+msgid "Open a calendar"
+msgstr "Abrir um calendАrio"
+
+#: po/tmp/evolution-calendar.xml.h:22
+msgid "Prev"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:24
+msgid "Print this calendar"
+msgstr "Imprimir este calendАrio"
+
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr "Mostrar 1 dia"
+
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr "Mostrar 1 mЙs"
+
+#: po/tmp/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr "Mostrar 1 semana"
+
+#: po/tmp/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
+msgid "Today"
+msgstr "Hoje"
+
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Semana"
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+msgid "_New"
+msgstr "_Novo"
+
+#: po/tmp/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "Abrir Ca_lendАrio"
+
+#: po/tmp/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "_Print this calendar"
+msgstr "Imprimir este calendАrio"
+
+#: po/tmp/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save Calendar As"
+msgstr "Guardar CalendАrio como"
+
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Apagar este item"
+
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "Apagar"
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+msgid "Help"
+msgstr ""
+
+#: po/tmp/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
+msgid "Print this item"
+msgstr "Imprimir este item"
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/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
+#, fuzzy
+msgid "Save _As..."
+msgstr "Gravar na _pasta..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+#, fuzzy
+msgid "Save and Close"
+msgstr "Guardar CalendАrio como"
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
+msgstr ""
+
+#: po/tmp/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
+msgid "See online help"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "_File"
 msgstr "_Pasta"
 
-#: shell/e-shell-view-menu.c:347
-msgid "Evolution _Bar Shortcut"
-msgstr "Atalho para _barra do Evolution"
+#: po/tmp/evolution-contact-editor.xml.h:20
+#, fuzzy
+msgid "_Print..."
+msgstr "Imprimir..."
 
-#: shell/e-shell-view-menu.c:353
-msgid "_Mail message"
-msgstr "Mensagem de _correio"
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
+msgid "_Save"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:354 shell/e-shell-view-menu.c:357
-msgid "Composes a new mail message"
-msgstr "Criar uma nova mensagem"
+#.
+#. * 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
+msgid "About this application"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:356
-msgid "_Appointment"
-msgstr "_Compromisso"
+#: po/tmp/evolution-event-editor.xml.h:7
+msgid "About..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:8
+msgid "Actio_ns"
+msgstr "_AcГУes"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "Carro"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "Cortar"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Clear"
+msgstr "Carro"
+
+#: po/tmp/evolution-event-editor.xml.h:12
+msgid "Clear the selection"
+msgstr ""
+
+#: po/tmp/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
+msgid "Copy"
+msgstr "Copiar"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "Cortar"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:359
-msgid "Meeting Re_quest"
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:28
+#, fuzzy
+msgid "FIXME: Define Print _Styles"
 msgstr "Pedido de _encontro"
 
-#: shell/e-shell-view-menu.c:362
-msgid "_Contact"
-msgstr "_Contacto"
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:365
-msgid "_Task"
-msgstr "_Tarefa"
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:38
+msgid "FIXME: Print Pre_view"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:43
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "Adicionar anexo..."
 
-#: shell/e-shell-view-menu.c:368
-msgid "Task _Request"
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:45
+#, fuzzy
+msgid "FIXME: Task _Request"
 msgstr "_Pedido de tarefa"
 
-#: shell/e-shell-view-menu.c:371
-msgid "_Journal Entry"
+#: po/tmp/evolution-event-editor.xml.h:46
+#, fuzzy
+msgid "FIXME: _Contact"
+msgstr "_Contacto"
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:50
+#, fuzzy
+msgid "FIXME: _Formatting"
+msgstr "_Contacto"
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:52
+#, fuzzy
+msgid "FIXME: _Journal Entry"
 msgstr "_Entrada diАria?"
 
-#: shell/e-shell-view-menu.c:374
-msgid "_Note"
-msgstr "_Nota"
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:384
-msgid "_Selected Items"
-msgstr "_Items seleccionados"
+#: po/tmp/evolution-event-editor.xml.h:54
+#, fuzzy
+msgid "FIXME: _Mail Message"
+msgstr "Mensagem de _correio"
 
-#: shell/e-shell-view-menu.c:392
-msgid "_New"
-msgstr "_Novo"
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:56
+msgid "FIXME: _Move to Folder..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:57
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "_Compromisso"
 
-#: shell/e-shell-view-menu.c:393
-msgid "_Open"
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr ""
+
+#: po/tmp/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
+msgid "F_ormat"
+msgstr "F_ormato"
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/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
+msgid "Go to the previous item"
+msgstr "Ir para o item anterior"
+
+#: po/tmp/evolution-event-editor.xml.h:72
+#, fuzzy
+msgid "Modify the file's properties"
+msgstr "Propriedades"
+
+#: po/tmp/evolution-event-editor.xml.h:73
+#, fuzzy
+msgid "N_ext"
+msgstr "PrС_ximo"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "Colar"
+
+#: po/tmp/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
+msgid "Pre_vious"
+msgstr "An_terior"
+
+#: po/tmp/evolution-event-editor.xml.h:78
+#, fuzzy
+msgid "Previous"
+msgstr "An_terior"
+
+#: po/tmp/evolution-event-editor.xml.h:79
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "Imprimir..."
+
+#: po/tmp/evolution-event-editor.xml.h:80
+#, fuzzy
+msgid "Print Setup"
+msgstr "Imprimir"
+
+#: po/tmp/evolution-event-editor.xml.h:83
+#, fuzzy
+msgid "Properties"
+msgstr "Propriedades do alarme"
+
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "Remover"
+
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "Responder"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "Save the current file"
+msgstr "Ficheiro com assinatura:"
+
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:99
+#, fuzzy
+msgid "Select All"
+msgstr "Reponder para todos"
+
+#: po/tmp/evolution-event-editor.xml.h:100
+msgid "Select everything"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr "Anular"
+
+#: po/tmp/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
+msgid "_About..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "Cores"
+
+#: po/tmp/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
+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
+#, fuzzy
+msgid "_Edit"
+msgstr "Editar..."
+
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "Encontrar"
+
+#: po/tmp/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
+msgid "_Help"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr "_Inserir"
+
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr "_Objecto"
+
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "Colar"
+
+#: po/tmp/evolution-event-editor.xml.h:117
+#, fuzzy
+msgid "_Print"
+msgstr "Imprimir"
+
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "Propriedades do alarme"
+
+#: po/tmp/evolution-event-editor.xml.h:119
+msgid "_Redo"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
+msgstr "_Ferramentas"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+#, fuzzy
+msgid "_Undo"
+msgstr "Anular"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
+#, fuzzy
+msgid "Compose"
+msgstr "Cores"
+
+#: po/tmp/evolution-mail.xml.h:7
+#, fuzzy
+msgid "Compose a new message"
+msgstr "Criar uma nova mensagem"
+
+#: po/tmp/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
+#, fuzzy
+msgid "F_older"
+msgstr "_Pastas"
+
+#: po/tmp/evolution-mail.xml.h:14
+msgid "Fi_lter on Sender"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:15
+msgid "Filter on Rec_ipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr "Esquecer _Senhas"
+
+#: po/tmp/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Get Mail"
+msgstr "_Correio"
+
+#: po/tmp/evolution-mail.xml.h:21
+msgid "Mail _Filters"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:22
+msgid "Manage Subscriptions"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Mar_k As Read"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:24
+msgid "Mark As U_nread"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:25
+#, fuzzy
+msgid "Move"
+msgstr "Sg"
+
+#: po/tmp/evolution-mail.xml.h:26
+#, fuzzy
+msgid "Move message to a new folder"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: po/tmp/evolution-mail.xml.h:27
+msgid "Previews the message to be printed"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Prever impressЦo"
+
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Print message..."
+msgstr "Encontrar mensagens"
+
+#: po/tmp/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Reponder para todos"
+
+#: po/tmp/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Reply to _Sender"
+msgstr "Reponder para todos"
+
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#, fuzzy
+msgid "Select _All"
+msgstr "Reponder para todos"
+
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:41
+msgid "Threaded Message list"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:42
+msgid "VFolder on Se_nder"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:43
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
+msgid "_Apply Filters"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:46
+#, fuzzy
+msgid "_Configure Folder"
+msgstr "_Nova pasta"
+
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "Ir para a _pasta..."
+
+#: po/tmp/evolution-mail.xml.h:49
+#, fuzzy
+msgid "_Edit Message"
+msgstr "Mensagem de _correio"
+
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:51
+msgid "_Filter on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:52
+msgid "_Forward"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "ConfiguraГЦo do correio"
+
+#: po/tmp/evolution-mail.xml.h:55
+#, fuzzy
+msgid "_Message"
+msgstr "Mensagem de _correio"
+
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "Ir para a _pasta..."
+
+#: po/tmp/evolution-mail.xml.h:57
+#, fuzzy
+msgid "_Open in New Window"
+msgstr "еbrir em nova janela"
+
+#: po/tmp/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Print Message"
+msgstr "Encontrar mensagens"
+
+#: po/tmp/evolution-mail.xml.h:59
+msgid "_Save Message As..."
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Fontes"
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "Apagar"
+
+#: po/tmp/evolution-mail.xml.h:63
+msgid "_VFolder on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:64
+msgid "_Virtual Folder Editor"
+msgstr ""
+
+#.
+#. * 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
+msgid "Attach"
+msgstr "Anexar"
+
+#: po/tmp/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
+msgid "HTML"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:12
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Anexar um ficheiro Ю mensagem"
+
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert text file..."
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "Abrir ficheiro"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "Guardar CalendАrio como"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "Gravar na _pasta..."
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Gravar na _pasta..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "Gravar a mensagem na pasta especificada"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Enviar"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+msgid "Send _Later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:26
+msgid "Send _later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:27
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "Enviar mensagem em formato HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Enviar a mensagem"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "Enviar a mensagem"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Enviar esta mensagem"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Ver/esconder anexos"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show _attachments"
+msgstr "Ver _anexos"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "Ver _anexos"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
 msgstr "_Abrir"
 
-#: shell/e-shell-view-menu.c:395
-msgid "Clos_e All Items"
-msgstr "_Fechar todos os items"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:395
-msgid "Closes all the open items"
-msgstr "Fecha todos os items abertos"
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:399
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Mostrar uma pasta diferente"
 
-#: shell/e-shell-view-menu.c:414
-msgid "Show _shortcut bar"
-msgstr "Mostrar barra de atalho_s"
+#: po/tmp/evolution.xml.h:7
+#, fuzzy
+msgid "E_xit"
+msgstr "PrС_ximo"
+
+#: po/tmp/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution bar _shortcut"
+msgstr "Atalho para _barra do Evolution"
 
-#: shell/e-shell-view-menu.c:415
-msgid "Show the shortcut bar"
-msgstr "Mostrar a barra de atalhos"
+#: po/tmp/evolution.xml.h:9
+msgid "Exit the program"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:417
-msgid "Show _folder bar"
-msgstr "Motrar barra de _pastas"
+#: po/tmp/evolution.xml.h:10
+msgid "Getting _Started"
+msgstr "_ComeГando"
 
-#: shell/e-shell-view-menu.c:418
-msgid "Show the folder bar"
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:12
+#, fuzzy
+msgid "Show the _Folder Bar"
 msgstr "Mostrar a barra de pastas"
 
-#: shell/e-shell-view-menu.c:435
-msgid "Help _Index"
-msgstr "мnd_ice de ajuda"
+#: po/tmp/evolution.xml.h:13
+#, fuzzy
+msgid "Show the _Shortcut Bar"
+msgstr "Mostrar a barra de atalhos"
 
-#: shell/e-shell-view-menu.c:438
-msgid "Getting _Started"
-msgstr "_ComeГando"
+#: po/tmp/evolution.xml.h:14
+msgid "Submit _Bug Report"
+msgstr ""
 
-#: shell/e-shell-view-menu.c:441
-msgid "Using the _Mailer"
+#: po/tmp/evolution.xml.h:15
+msgid "Submit bug report using Bug Buddy."
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "Toggle whether to show the shortcut bar"
+msgstr "Mostrar a barra de atalhos"
+
+#: po/tmp/evolution.xml.h:18
+#, fuzzy
+msgid "Using the C_ontact Manager"
 msgstr "Usando o programa de C_orreio"
 
-#: shell/e-shell-view-menu.c:444
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Usando o _CalendАrio"
 
-#: shell/e-shell-view-menu.c:447
-msgid "Using the Cont_act Manager"
-msgstr ""
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
+msgstr "Usando o programa de C_orreio"
 
-#: shell/e-shell-view-menu.c:452
-msgid "_Submit bug report"
-msgstr ""
+#: po/tmp/evolution.xml.h:21
+#, fuzzy
+msgid "_About Evolution..."
+msgstr "Evolution"
 
-#: shell/e-shell-view-menu.c:453
-msgid "Submit bug-report via bug-buddy"
-msgstr ""
+#: po/tmp/evolution.xml.h:22
+#, fuzzy
+msgid "_Appointment (FIXME)"
+msgstr "_Compromisso"
 
-#: shell/e-shell-view-menu.c:469
-msgid "_Actions"
-msgstr "_AcГУes"
+#: po/tmp/evolution.xml.h:23
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "_Contacto"
 
-#: shell/e-init.c:25
-msgid "Evolution can not create its local folders"
-msgstr "O Evolution nЦo consegue criar as suas pastas locais"
+#: po/tmp/evolution.xml.h:26
+msgid "_Folder"
+msgstr "_Pasta"
 
-#: shell/e-shortcuts.c:358
-msgid "Error saving shortcuts."
-msgstr "Erro a gravar os atalhos."
+#: po/tmp/evolution.xml.h:27
+#, fuzzy
+msgid "_Go to Folder..."
+msgstr "Ir para a _pasta..."
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:385
-msgid "Tentative"
+#: po/tmp/evolution.xml.h:29
+#, fuzzy
+msgid "_Index"
+msgstr "мnd_ice de ajuda"
+
+#: po/tmp/evolution.xml.h:30
+#, fuzzy
+msgid "_Mail message (FIXME)"
+msgstr "Mensagem de _correio"
+
+#: po/tmp/evolution.xml.h:32
+msgid "_Settings"
+msgstr ""
+
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
 msgstr ""
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
+msgid "Tentative"
+msgstr ""
+
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
 msgid "Busy"
 msgstr "Ocupado"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:387
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
 msgid "Out of Office"
 msgstr "Fora do escritСrio"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:388
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:389
 msgid "No Information"
 msgstr "Nenhuma InformaГЦo"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:404
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:405
 msgid "_Invite Others..."
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:424
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:425
 msgid "_Options"
 msgstr "_OpГУes"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:441
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:442
 msgid "Show _Only Working Hours"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:454
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:455
 msgid "Show _Zoomed Out"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:472
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:473
 msgid "_Update Free/Busy"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:490
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:491
 msgid "_<<"
 msgstr "_<<"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:507
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:508
 msgid "_Autopick"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:521
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:538
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:539
 msgid "_All People and Resources"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:551
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:552
 msgid "All _People and One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:564
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:565
 msgid "_Required People"
 msgstr "Pessoas _NecessЦrias"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:577
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:578
 msgid "Required People and _One Resource"
 msgstr ""
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:600
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:601
 msgid "Meeting _start time:"
 msgstr "Hora de Мn_icio de encontro"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:624
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:625
 msgid "Meeting _end time:"
 msgstr "Hora de _fim de _encontro"
 
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:737
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:738
 msgid "All Attendees"
 msgstr ""
 
-#: widgets/shortcut-bar/e-group-bar.c:631
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+msgid "%B %Y"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
+msgid "..."
+msgstr "..."
+
+#: widgets/misc/e-dateedit.c:408
+#, 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
+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
+msgid "%I:%M %p"
+msgstr ""
+
+#: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
 
-#: widgets/misc/e-clipped-label.c:106
-msgid "..."
-msgstr "..."
+#, fuzzy
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "_Compromisso"
+
+#~ 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"
+
+#~ msgid "Show 1 year"
+#~ msgstr "Mostrar 1 ano"
+
+#~ msgid "_Close Calendar"
+#~ msgstr "_Fechar CalendАrio"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Novo compromisso..."
+
+#~ msgid "New appointment for _today..."
+#~ msgstr "Novo compromisso para _hoje..."
+
+#~ msgid "Create a new appointment for today"
+#~ msgstr "Criar um novo compromisso para hoje"
+
+#~ msgid "About Calendar"
+#~ msgstr "Sobre o calendАrio"
+
+#~ msgid "%s%s"
+#~ msgstr "%s%s"
+
+#, fuzzy
+#~ msgid "'s calendar"
+#~ msgstr "O seu calendАrio"
+
+#~ msgid "Syncing with the pilot..."
+#~ msgstr "Sincronizando com o pilot..."
+
+#~ msgid "Edit this item..."
+#~ msgstr "Editar este item..."
+
+#, fuzzy
+#~ msgid "To-do list"
+#~ msgstr "_Ferramentas"
+
+#~ msgid "Second"
+#~ msgstr "Segundo"
+
+#~ msgid "?"
+#~ msgstr "?"
+
+#~ msgid "Cut selected item into clipboard"
+#~ msgstr "Cortar item seleccionado para a Аrea de transferЙncia"
+
+#~ msgid "Copy selected item into clipboard"
+#~ msgstr "Copiar item seleccionada para a Аrea de transferЙncia"
+
+#~ msgid "Select recipients' addresses"
+#~ msgstr "Seleccionar o endereГo dos receptores"
+
+#~ msgid "Discard this message?"
+#~ msgstr "Descartar esta mensagem?"
+
+#~ msgid "Cut selected region into the clipboard"
+#~ msgstr "Cortar a regiЦo seleccionada para a Аrea de transferЙncia"
+
+#~ msgid "Copy selected region into the clipboard"
+#~ msgstr "Copiar a regiЦo seleccionada para a Аrea de transferЙncia"
+
+#~ msgid "Paste selected region into the clipboard"
+#~ msgstr "Colar a regiЦo seleccionada para a Аrea de transferЙncia"
+
+#~ 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"
+
+#~ msgid "Composes a new mail message"
+#~ msgstr "Criar uma nova mensagem"
+
+#~ msgid "Meeting Re_quest"
+#~ msgstr "Pedido de _encontro"
+
+#~ msgid "Task _Request"
+#~ msgstr "_Pedido de tarefa"
+
+#~ msgid "_Journal Entry"
+#~ msgstr "_Entrada diАria?"
+
+#~ msgid "Clos_e All Items"
+#~ msgstr "_Fechar todos os items"
+
+#~ msgid "Closes all the open items"
+#~ msgstr "Fecha todos os items abertos"
+
+#~ msgid "Show _shortcut bar"
+#~ msgstr "Mostrar barra de atalho_s"
+
+#~ msgid "Show _folder bar"
+#~ msgstr "Motrar barra de _pastas"
 
 #~ msgid ""
 #~ "Evolution detected that the file `%s' is a not a directory.\n"
@@ -2453,9 +6915,6 @@ msgstr "..."
 #~ " o programa.\n"
 #~ "     Foi avisado\n"
 
-#~ msgid "_Mail"
-#~ msgstr "_Correio"
-
 #~ msgid "We are sorry, Evolution's Folder Browser can not be initialized."
 #~ msgstr ""
 #~ "Pedimos desculpa. O navegador de pastas do Evolution nЦo pode ser "
@@ -2464,25 +6923,9 @@ msgstr "..."
 #~ msgid "Whether a message preview should be shown"
 #~ msgstr "Se uma previsЦo da mensagem deve ser mostrada"
 
-#~ msgid ""
-#~ "An exception occured while trying to load data into the component with "
-#~ "PersistStream"
-#~ msgstr ""
-#~ "Um excepГЦo ocorreu enquanto se tentava carregar dados no componente com "
-#~ "PersistStream"
-
 #~ msgid "The %s component doesn't support PersistStream!\n"
 #~ msgstr "O componente %s nЦo suporta PersistStream!\n"
 
-#~ msgid "Message status"
-#~ msgstr "SituaГЦo das mensagens"
-
-#~ msgid "Attachment"
-#~ msgstr "Anexo"
-
-#~ msgid "Sent"
-#~ msgstr "Enviar"
-
 #~ msgid "A folder containing mail items"
 #~ msgstr "Uma pasta contendo items de correio"
 
@@ -2492,9 +6935,6 @@ msgstr "..."
 #~ msgid "A folder containing calendar entries"
 #~ msgstr "Uma pasta contendo entradas de calendАrio"
 
-#~ msgid "A folder containing tasks"
-#~ msgstr "Uma pasta contendo tarefas"
-
 #~ msgid "A service containing mail items"
 #~ msgstr "Um serviГo contendo items de correio"
 
@@ -2507,27 +6947,15 @@ msgstr "..."
 #~ msgid "A service containing tasks"
 #~ msgstr "Um serviГo contendo tarefas"
 
-#~ msgid "Add New Group"
-#~ msgstr "Adicionar novo grupo"
-
-#~ msgid "Remove Group"
-#~ msgstr "Remover grupo"
-
 #~ msgid "Rename Group"
 #~ msgstr "Mudar nome de grupo"
 
-#~ msgid "Open in New Window"
-#~ msgstr "еbrir em nova janela"
-
 #~ msgid "Advanced Find"
 #~ msgstr "Encontrar avanГado"
 
 #~ msgid "Rename Shortcut"
 #~ msgstr "Mudar nome de atalho"
 
-#~ msgid "_New Folder"
-#~ msgstr "_Nova pasta"
-
 #~ msgid "Executive Summary"
 #~ msgstr "SumАrio executivo"
 
@@ -2540,9 +6968,6 @@ msgstr "..."
 #~ msgid "Sent mail messages"
 #~ msgstr "Mensagens enviadas"
 
-#~ msgid "Draft mail messages"
-#~ msgstr "Mensagens de correio em rascunho"
-
 #~ msgid "Your contacts list"
 #~ msgstr "A sua lista de contactos"
 
diff --git a/po/ru.po b/po/ru.po
index 9f4055dbfa..14549cecd8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: E-volution\n"
-"POT-Creation-Date: 2000-12-13 15:49+0300\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-12-13 15:51+03:00\n"
 "Last-Translator: Valek Filippov <frob@df.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -2744,7 +2744,7 @@ msgstr "Строка URL \"%s\" содержит недопустимый протокол"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Номер порта в URL \"%s\" не является числом"
 
-#: camel/providers/imap/camel-imap-auth.c:126
+#: camel/providers/imap/camel-imap-auth.c:127
 #, c-format
 msgid ""
 "Could not get Kerberos ticket:\n"
@@ -2753,7 +2753,7 @@ msgstr ""
 "Не удалось получить билет Kerberos:\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-auth.c:197
+#: camel/providers/imap/camel-imap-auth.c:198
 msgid "Bad authentication response from server."
 msgstr "Отрицательный ответ идентификации от сервера."
 
@@ -2803,6 +2803,7 @@ 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 "Пароль"
@@ -3139,6 +3140,77 @@ msgstr "Невозможно добавить сообщение к папке mh: %s: %s"
 msgid "`%s' is not a directory."
 msgstr "\"%s\" не является каталогом."
 
+#: 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:144
+#, 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:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr "Не удалось открыть папку: список сообщений был неполон."
@@ -4202,18 +4274,6 @@ msgstr "Передача почты"
 msgid "Welcome to the Evolution Mail configuration wizard!\n"
 msgstr "Добро пожаловать к помощнику по настройке почты в Evolution!\n"
 
-#: po/tmp/mail-config-druid.glade.h:11
-msgid "By filling in some information about your email\n"
-msgstr "Введя некоторую информацию о параметрах вашей электронной\n"
-
-#: po/tmp/mail-config-druid.glade.h:12
-msgid "settings, you can start sending and receiving email\n"
-msgstr "почты, вы сможете начать ее отправку и приём\n"
-
-#: po/tmp/mail-config-druid.glade.h:13
-msgid "right away. Click Next to continue."
-msgstr "Нажмите \"Далее\" для продолжения."
-
 #: po/tmp/mail-config-druid.glade.h:14
 msgid ""
 "Your email configuration is now complete.\n"
@@ -6620,3 +6680,12 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "Группа %i"
+
+#~ 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 "Нажмите \"Далее\" для продолжения."
diff --git a/po/sl.po b/po/sl.po
index aba65ed74a..0cca635b01 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2000-11-13 19:14+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -13,11 +13,11 @@ msgstr ""
 "Content-Type: text/plain; charset=iso8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:3044
+#: addressbook/backend/ebook/e-card.c:3046
 msgid "Card: "
 msgstr "Vizitka: "
 
-#: addressbook/backend/ebook/e-card.c:3046
+#: addressbook/backend/ebook/e-card.c:3048
 msgid ""
 "\n"
 "Name: "
@@ -25,7 +25,7 @@ msgstr ""
 "\n"
 "Ime: "
 
-#: addressbook/backend/ebook/e-card.c:3047
+#: addressbook/backend/ebook/e-card.c:3049
 msgid ""
 "\n"
 "  Prefix:     "
@@ -33,7 +33,7 @@ msgstr ""
 "\n"
 "  Predpona:   "
 
-#: addressbook/backend/ebook/e-card.c:3048
+#: addressbook/backend/ebook/e-card.c:3050
 msgid ""
 "\n"
 "  Given:      "
@@ -41,7 +41,7 @@ msgstr ""
 "\n"
 "  Dano:       "
 
-#: addressbook/backend/ebook/e-card.c:3049
+#: addressbook/backend/ebook/e-card.c:3051
 msgid ""
 "\n"
 "  Additional: "
@@ -49,7 +49,7 @@ msgstr ""
 "\n"
 "  Dodatno:    "
 
-#: addressbook/backend/ebook/e-card.c:3050
+#: addressbook/backend/ebook/e-card.c:3052
 msgid ""
 "\n"
 "  Family:     "
@@ -57,7 +57,7 @@ msgstr ""
 "\n"
 "  Dru╬insko:     "
 
-#: addressbook/backend/ebook/e-card.c:3051
+#: addressbook/backend/ebook/e-card.c:3053
 msgid ""
 "\n"
 "  Suffix:     "
@@ -65,7 +65,7 @@ msgstr ""
 "\n"
 "  Pripona:    "
 
-#: addressbook/backend/ebook/e-card.c:3065
+#: addressbook/backend/ebook/e-card.c:3067
 msgid ""
 "\n"
 "Birth Date: "
@@ -73,7 +73,7 @@ msgstr ""
 "\n"
 "Datum rojstva: "
 
-#: addressbook/backend/ebook/e-card.c:3076
+#: addressbook/backend/ebook/e-card.c:3078
 msgid ""
 "\n"
 "Address:"
@@ -81,7 +81,7 @@ msgstr ""
 "\n"
 "Naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3078
+#: addressbook/backend/ebook/e-card.c:3080
 msgid ""
 "\n"
 "  Postal Box:  "
@@ -89,7 +89,7 @@ msgstr ""
 "\n"
 "  Po╧tni predal:  "
 
-#: addressbook/backend/ebook/e-card.c:3079
+#: addressbook/backend/ebook/e-card.c:3081
 msgid ""
 "\n"
 "  Ext:         "
@@ -97,7 +97,7 @@ msgstr ""
 "\n"
 "  Interna:     "
 
-#: addressbook/backend/ebook/e-card.c:3080
+#: addressbook/backend/ebook/e-card.c:3082
 msgid ""
 "\n"
 "  Street:      "
@@ -105,7 +105,7 @@ msgstr ""
 "\n"
 "  Ulica:       "
 
-#: addressbook/backend/ebook/e-card.c:3081
+#: addressbook/backend/ebook/e-card.c:3083
 msgid ""
 "\n"
 "  City:        "
@@ -113,7 +113,7 @@ msgstr ""
 "\n"
 "  Mesto:       "
 
-#: addressbook/backend/ebook/e-card.c:3082
+#: addressbook/backend/ebook/e-card.c:3084
 msgid ""
 "\n"
 "  Region:      "
@@ -121,7 +121,7 @@ msgstr ""
 "\n"
 "  Regija:      "
 
-#: addressbook/backend/ebook/e-card.c:3083
+#: addressbook/backend/ebook/e-card.c:3085
 msgid ""
 "\n"
 "  Postal Code: "
@@ -129,7 +129,7 @@ msgstr ""
 "\n"
 "  Po╧tna ╧tevilka: "
 
-#: addressbook/backend/ebook/e-card.c:3084
+#: addressbook/backend/ebook/e-card.c:3086
 msgid ""
 "\n"
 "  Country:     "
@@ -137,7 +137,7 @@ msgstr ""
 "\n"
 "  Dr╬ava:      "
 
-#: addressbook/backend/ebook/e-card.c:3097
+#: addressbook/backend/ebook/e-card.c:3099
 msgid ""
 "\n"
 "Delivery Label: "
@@ -145,7 +145,7 @@ msgstr ""
 "\n"
 "Dostavna oznaka: "
 
-#: addressbook/backend/ebook/e-card.c:3109
+#: addressbook/backend/ebook/e-card.c:3111
 msgid ""
 "\n"
 "Telephones:\n"
@@ -153,7 +153,7 @@ msgstr ""
 "\n"
 "Telefoni:\n"
 
-#: addressbook/backend/ebook/e-card.c:3112
+#: addressbook/backend/ebook/e-card.c:3114
 msgid ""
 "\n"
 "Telephone:"
@@ -161,7 +161,7 @@ msgstr ""
 "\n"
 "Telefon:"
 
-#: addressbook/backend/ebook/e-card.c:3136
+#: addressbook/backend/ebook/e-card.c:3138
 msgid ""
 "\n"
 "E-mail:\n"
@@ -169,7 +169,7 @@ msgstr ""
 "\n"
 "E-naslov:\n"
 
-#: addressbook/backend/ebook/e-card.c:3139
+#: addressbook/backend/ebook/e-card.c:3141
 msgid ""
 "\n"
 "E-mail:"
@@ -177,7 +177,7 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/backend/ebook/e-card.c:3158
+#: addressbook/backend/ebook/e-card.c:3160
 msgid ""
 "\n"
 "Mailer: "
@@ -185,7 +185,7 @@ msgstr ""
 "\n"
 "Po╧tni program: "
 
-#: addressbook/backend/ebook/e-card.c:3164
+#: addressbook/backend/ebook/e-card.c:3166
 msgid ""
 "\n"
 "Time Zone: "
@@ -193,7 +193,7 @@ msgstr ""
 "\n"
 "хasovna cona: "
 
-#: addressbook/backend/ebook/e-card.c:3172
+#: addressbook/backend/ebook/e-card.c:3174
 msgid ""
 "\n"
 "Geo Location: "
@@ -201,7 +201,7 @@ msgstr ""
 "\n"
 "Geografski polo╬aj: "
 
-#: addressbook/backend/ebook/e-card.c:3176
+#: addressbook/backend/ebook/e-card.c:3178
 msgid ""
 "\n"
 "Business Role: "
@@ -209,7 +209,7 @@ msgstr ""
 "\n"
 "Poslovna vloga: "
 
-#: addressbook/backend/ebook/e-card.c:3188
+#: addressbook/backend/ebook/e-card.c:3190
 msgid ""
 "\n"
 "Org: "
@@ -217,7 +217,7 @@ msgstr ""
 "\n"
 "Organizacija: "
 
-#: addressbook/backend/ebook/e-card.c:3189
+#: addressbook/backend/ebook/e-card.c:3191
 msgid ""
 "\n"
 "  Name:  "
@@ -225,7 +225,7 @@ msgstr ""
 "\n"
 "  Ime:   "
 
-#: addressbook/backend/ebook/e-card.c:3190
+#: addressbook/backend/ebook/e-card.c:3192
 msgid ""
 "\n"
 "  Unit:  "
@@ -233,7 +233,7 @@ msgstr ""
 "\n"
 "  Enota:  "
 
-#: addressbook/backend/ebook/e-card.c:3191
+#: addressbook/backend/ebook/e-card.c:3193
 msgid ""
 "\n"
 "  Unit2: "
@@ -241,7 +241,7 @@ msgstr ""
 "\n"
 "  Enota2: "
 
-#: addressbook/backend/ebook/e-card.c:3192
+#: addressbook/backend/ebook/e-card.c:3194
 msgid ""
 "\n"
 "  Unit3: "
@@ -249,7 +249,7 @@ msgstr ""
 "\n"
 "  Enota3: "
 
-#: addressbook/backend/ebook/e-card.c:3193
+#: addressbook/backend/ebook/e-card.c:3195
 msgid ""
 "\n"
 "  Unit4: "
@@ -257,7 +257,7 @@ msgstr ""
 "\n"
 "  Enota4: "
 
-#: addressbook/backend/ebook/e-card.c:3197
+#: addressbook/backend/ebook/e-card.c:3199
 msgid ""
 "\n"
 "Categories: "
@@ -265,7 +265,7 @@ msgstr ""
 "\n"
 "Categorije: "
 
-#: addressbook/backend/ebook/e-card.c:3198
+#: addressbook/backend/ebook/e-card.c:3200
 msgid ""
 "\n"
 "Comment: "
@@ -283,7 +283,7 @@ msgstr ""
 #.
 #. add_SoundType (string, crd->sound.type);
 #. }
-#: addressbook/backend/ebook/e-card.c:3211
+#: addressbook/backend/ebook/e-card.c:3213
 msgid ""
 "\n"
 "Unique String: "
@@ -291,7 +291,7 @@ msgstr ""
 "\n"
 "EnoliХen niz:  "
 
-#: addressbook/backend/ebook/e-card.c:3214
+#: addressbook/backend/ebook/e-card.c:3216
 msgid ""
 "\n"
 "Public Key: "
@@ -303,10 +303,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:910
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1091
-#: calendar/conduits/todo/todo-conduit.c:965 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
@@ -429,28 +429,28 @@ msgstr ""
 "Ob prena╧anju seznama pilotov s gnome-pilot\n"
 "daemona se je zgodila napaka"
 
-#: addressbook/conduit/address-conduit.c:193
+#: addressbook/conduit/address-conduit.c:197
 msgid "Cursor could not be loaded\n"
 msgstr "Kazalec se ni mogel nalo╬iti\n"
 
-#: addressbook/conduit/address-conduit.c:206
+#: addressbook/conduit/address-conduit.c:210
 msgid "EBook not loaded\n"
 msgstr "EKnjiga ni nalo╬ena\n"
 
-#: addressbook/conduit/address-conduit.c:490
-#: calendar/conduits/calendar/calendar-conduit.c:651
-#: calendar/conduits/todo/todo-conduit.c:524
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
 msgid "Could not start wombat server"
 msgstr "Nisem mogel pognati stre╬nika wombat"
 
-#: addressbook/conduit/address-conduit.c:491
-#: calendar/conduits/calendar/calendar-conduit.c:652
-#: calendar/conduits/todo/todo-conduit.c:525
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 msgid "Could not start wombat"
 msgstr "Nisem mogel pognati programa wombat"
 
-#: addressbook/conduit/address-conduit.c:517
-#: addressbook/conduit/address-conduit.c:520
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
@@ -471,113 +471,11 @@ msgstr "Predmet(i) pripada(jo) tem kategorijam:"
 msgid "Available Categories:"
 msgstr "Dostopne kategorije:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr "PomoХnik"
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr "Slu╬ba"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr "Slu╬ba"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr "Slu╬beni faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr "Povratni klic"
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr "Avto"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr "Podjetje"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr "Doma"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr "Doma 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr "DomaХi faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr "Prenosni telefon"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "Drugo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr "Drugi faks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr "Pozivnik"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr "Prvi"
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr "Radijo"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr "Teleks"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-msgstr "E-naslov 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ste prepriХani, da \n"
-"╬elite izbrisati ta stik?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Zbri╧i stik?"
 
@@ -591,7 +489,7 @@ msgid "_Add"
 msgstr "_Dodaj"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-event-editor.h:72 ui/evolution-mail.h:48
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "_Zbri╧i"
 
@@ -604,11 +502,13 @@ msgstr "Tipi telefonov"
 msgid "New phone type"
 msgstr "Nov tip telefona"
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:71 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Dodaj"
 
@@ -648,6 +548,11 @@ msgstr "Slu╬beni _faks"
 msgid "_Mobile"
 msgstr "_Prenosni telefon"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "prvi e-naslov"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "V sl_u╬bi"
@@ -661,7 +566,7 @@ msgid "C_ontacts..."
 msgstr "_Stiki..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
@@ -678,7 +583,7 @@ msgid "_Address..."
 msgstr "_Naslov..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Splo╧no"
 
@@ -723,59 +628,146 @@ msgid "No_tes:"
 msgstr "Opom_be:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Podrobnosti"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "PomoХnik"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Slu╬ba"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Slu╬ba"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Slu╬beni faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Povratni klic"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Avto"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Podjetje"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Doma"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Doma 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "DomaХi faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Drugo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Drugi faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Pozivnik"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Prvi"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radijo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E-naslov 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E-naslov 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "Naslov _2:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Kanada"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Preveri naslov"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Dr╬a_va:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Finska"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "ZDA"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "_Naslov:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "_Mesto:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "_Po╧tni predal:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "Naslov _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "_Dr╬ava/Provinca:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "ZDA"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Kanada"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Finska"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "_Po╧tna ╧tevilka:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "Dr╬a_va:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -835,18 +827,16 @@ msgstr "_Priimek:"
 msgid "_Suffix:"
 msgstr "P_ripona:"
 
-#: addressbook/gui/component/addressbook.c:265
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Kot _minivizitke"
 
 #.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/addressbook.c:271 ui/evolution-addressbook.h:9
+#: addressbook/gui/component/addressbook.c:269
+#: po/tmp/evolution-addressbook.xml.h:6
 msgid "As _Table"
 msgstr "Kot tabelo"
 
@@ -855,6 +845,7 @@ msgid "Unable to open addressbook"
 msgstr "Kliknite tu za odprtje adresarja"
 
 #: addressbook/gui/component/addressbook.c:391
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -863,7 +854,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Adresarja ni bilo mogoХe odpreti. To lahko pomeni ali\n"
 "da ste vnesli napaХen URI, ali pa posku╧ali dostopati \n"
@@ -873,7 +864,32 @@ 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:574
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#, fuzzy
+msgid "Show All"
+msgstr "Ka╬i"
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#, fuzzy
+msgid "Advanced..."
+msgstr "Dodaj..."
+
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "Telo vsebuje"
+
+#: addressbook/gui/component/addressbook.c:534
+#, fuzzy
+msgid "Name contains"
+msgstr "vsebuje"
+
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "vsebuje"
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "URI, ki naj ga prika╬e brskalnik map"
 
@@ -882,172 +898,169 @@ msgid "External Directories"
 msgstr "Zunanji imeniki"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Opis:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "LDAP stre╬nik:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "Ime:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "╘tevilka vrat:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr "Korenski DN:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-msgstr "Ime:"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Izberi imena"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Poi╧Хi..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "Prejemniki sporoХila"
+
+#: po/tmp/select-names.glade.h:8
+msgid "Select Names"
+msgstr "Izberi imena"
+
+#: po/tmp/select-names.glade.h:9
 msgid "Select name from List:"
 msgstr "Izberi ime s seznama:"
 
-#: addressbook/gui/component/select-names/select-names.glade.h:10
-msgid "Message Recipients"
-msgstr "Prejemniki sporoХila"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+msgstr "I╧Хi"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "okno2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Shrani kot vVizitko"
 
@@ -1069,197 +1082,187 @@ msgstr ""
 "\n"
 "хe ╬elite ustvariti nov stik, dvojno kliknite tu.."
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:643 mail/mail-search-dialogue.c:101
-msgid "Search"
-msgstr "I╧Хi"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Nastavitev strani:"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Ime stila:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "Predogled:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 pik Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Mo╬nosti"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 pik Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "VkljuХi:"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "Prazni obrazci na koncu:"
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "Sekcije:"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Telo"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "Si sledijo takoj"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Spodaj:"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "Uhlji Хrk ob strani"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Mere:"
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "Zaglavja za vsako Хrko"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Pisava..."
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "ZaХni na novi strani"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "Pisave"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "╘tevilo stolpcev:"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "Noga:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "Prazni obrazci na koncu:"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Oblika izpisa"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "Pisave"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "Glava"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Pisava..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "Glava/noga"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "Zaglavja"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 pik Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "Zaglavja za vsako Хrko"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Telo"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "Vi╧ina:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 pik Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr "Si sledijo takoj"
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "SenХenje"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "VkljuХi:"
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "Tiskaj z uporabo sivinskega senХenja"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Le╬eХe"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Oblika izpisa"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Levo:"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Papir"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "Uhlji Хrk ob strani"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Tip:"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Robovi"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "label26"
-msgstr "oznaХba26"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "╘tevilo stolpcev:"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Mere:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Mo╬nosti"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "╘irina:"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Usmerjenost"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "Vi╧ina:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Stran"
+
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "Nastavitev strani:"
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Papir"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Izvor papirja:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Robovi"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "PokonХno"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "Zgoraj:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "Predogled:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Spodaj:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "Tiskaj z uporabo sivinskega senХenja"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Levo:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "Obratno na sodih straneh"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Desno:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Stran"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "Sekcije:"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "SenХenje"
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Velikost:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Usmerjenost"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "PokonХno"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "ZaХni na novi strani"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Le╬eХe"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Ime stila:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "Glava"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Zgoraj:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "Noga:"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Tip:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "Obratno na sodih straneh"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "╘irina:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "Glava/noga"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "oznaХba26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "dop"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pop"
 
@@ -1271,13 +1274,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:607
-#: calendar/conduits/todo/todo-conduit.c:480
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr "Napaka ob komuniciranju s koledarskim stre╬nikom"
 
-#: calendar/conduits/calendar/calendar-conduit.c:706
-#: calendar/conduits/calendar/calendar-conduit.c:709
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr "Nisem mogel prebrati Pilotovega koledarja"
 
@@ -1289,8 +1292,8 @@ 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:579
-#: calendar/conduits/todo/todo-conduit.c:582
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama za-opravit"
 
@@ -1334,49 +1337,46 @@ msgstr "Predmet za-opravit, ki je na vrsti danes:"
 msgid "To-Do item that is overdue:"
 msgstr "Predmet za-opravit, ki je ╬e pretekel:"
 
-#: calendar/gui/calendar-commands.c:382
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Datoteke ni mogoХe najti"
 
-#: calendar/gui/calendar-commands.c:406
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Odpri koledar"
 
-#: calendar/gui/calendar-commands.c:445
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Shrani koledar"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d/%m/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Javno"
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Osebno"
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Zaupno"
 
@@ -1408,7 +1408,7 @@ msgstr "Prozorno"
 msgid "Opaque"
 msgstr "Prosojno"
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1420,36 +1420,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:228 widgets/misc/e-dateedit.c:514
-#: widgets/misc/e-dateedit.c:545 widgets/misc/e-dateedit.c:701
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 msgid "%m/%d/%Y"
 msgstr "%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:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1459,15 +1458,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v procentih mora biti med vkljuХno 0 in 100"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Prioriteta mora biti med vkljuХno 1 in 9"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI, ki naj ga prika╬e brskalnik map"
 
@@ -1484,477 +1483,460 @@ msgid "No summary available."
 msgstr "Povzetek ni na voljo."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-event-editor.h:19
-#: ui/evolution-subscribe.h:10
+#: 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
 msgid "Close"
 msgstr "Zapri"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Podalj╧ek spanja"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Uredi zmenek"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: 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
 msgid "Snooze time (minutes)"
 msgstr "хas podalj╧ka spanja (minut)"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "Nastavitve koledarja"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Delavni teden"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "pon"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "tor"
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "sre"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Хet"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 urna (dop./pop.)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "pet"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "sob"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 urna"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "ned"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "Prvi dan tedna:"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: calendar/gui/event-editor-dialog.glade.h:45 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "ponedeljek"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
+msgstr "Alarmi preteХejo po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Tuesday"
-msgstr "torek"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
+msgstr "ZvoХni alarmi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "Wednesday"
-msgstr "sreda"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr "Pozvoni, ko se poka╬ejo okna alarmov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:48
-msgid "Thursday"
-msgstr "Хetrtek"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Koledar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "Friday"
-msgstr "petek"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "Nastavitve koledarja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "Saturday"
-msgstr "sobota"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Barve"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:51 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "nedeljo"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr "SkrХi vikende"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "ZaХetek dneva:"
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr "Mo╬nosti navigatorja datumov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "Konec dneva:"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "Privzeto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
+#: po/tmp/cal-prefs-dialog.glade.h:22
 msgid "Display options"
 msgstr "Poka╬i mo╬nosti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "хasovne delitve"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "Oblika izpisa Хasa"
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "Do datuma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
-msgstr "Ka╬i Хase koncev zmenkov"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
+msgstr "OmogoХi podalj╧anje spanja za"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
-msgstr "SkrХi vikende"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 urna (dop./pop.)"
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "Prvi dan tedna:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 urna"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 minut"
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "petek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
+msgstr "Osvetlji:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:30
+msgid "Items Due Today"
+msgstr "Predmeti z dana╧njim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
+msgstr "Predmeti z rokom danes:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 minut"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr "Predmeti z rokom v prihodnosti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
-msgid "Date navigator options"
-msgstr "Mo╬nosti navigatorja datumov"
+#: po/tmp/cal-prefs-dialog.glade.h:33
+msgid "Items Not Yet Due:"
+msgstr "Predmeti z rokom v prihodnosti:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
-msgstr "Ka╬i ╧tevilke tednov"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Koledar"
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "ponedeljek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
-msgstr "Ka╬i"
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
+msgstr "Predmeti s prekoraХenim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
-msgid "Due Date"
-msgstr "Do datuma"
+#: po/tmp/cal-prefs-dialog.glade.h:37
+msgid "Overdue Items:"
+msgstr "Predmeti s prekoraХenim rokom:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
-msgid "Time Until Due"
-msgstr "хas do preteka"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr "Izberi barvo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Prioriteta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr "Osvetlji:"
+#: po/tmp/cal-prefs-dialog.glade.h:40
+msgid "Remind me of all appointments"
+msgstr "Opomni me na vse zmenke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
-msgstr "Predmeti s prekoraХenim rokom"
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
+msgstr "Opozorila"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-msgid "Items Due Today"
-msgstr "Predmeti z dana╧njim rokom"
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
-msgstr "Predmeti z rokom v prihodnosti"
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Barve"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr "Ka╬i"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
-msgstr "Izberi barvo"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
+msgstr "Ka╬i Хase koncev zmenkov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-msgid "Items Not Yet Due:"
-msgstr "Predmeti z rokom v prihodnosti:"
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
+msgstr "Ka╬i ╧tevilke tednov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
-msgstr "Predmeti z rokom danes:"
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "ZaХetek dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
-msgid "Overdue Items:"
-msgstr "Predmeti s prekoraХenim rokom:"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "nedeljo"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
 msgid "TaskPad"
 msgstr "Naloge"
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr "Privzeto"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
-msgid "Remind me of all appointments"
-msgstr "Opomni me na vse zmenke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
-msgstr "minut preden se zgodijo"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "Хet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr "Vidni alarmi"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Хetrtek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr "Pozvoni, ko se poka╬ejo okna alarmov"
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr "хas do preteka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
-msgstr "ZvoХni alarmi"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr "хasovne delitve"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
-msgstr "Alarmi preteХejo po"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr "Oblika izpisa Хasa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "seconds."
-msgstr "sekundah."
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+msgstr "tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr "OmogoХi podalj╧anje spanja za"
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "torek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
-msgstr "Opozorila"
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
+msgstr "Vidni alarmi"
 
-#: calendar/gui/dialogs/task-editor.c:655
-msgid "Edit Task"
-msgstr "Uredi nalogo"
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "sre"
 
-#: calendar/gui/dialogs/task-editor.c:661 calendar/gui/event-editor.c:303
-msgid "No summary"
-msgstr "Ni povzetka"
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "sreda"
 
-#: calendar/gui/dialogs/task-editor.c:667 calendar/gui/event-editor.c:309
-#, c-format
-msgid "Appointment - %s"
-msgstr "Zmenek - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "Delavni teden"
 
-#: calendar/gui/dialogs/task-editor.c:670 calendar/gui/event-editor.c:312
-#, c-format
-msgid "Task - %s"
-msgstr "Naloga - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr "minut preden se zgodijo"
 
-#: calendar/gui/dialogs/task-editor.c:673 calendar/gui/event-editor.c:315
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Vpis v dnevniku - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
+msgstr "sekundah."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr "dialog-urejevalnik-dogodkov"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
-msgstr "_Povzetek"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
-msgstr "Datum _priХetka:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
-msgstr "_Do datuma:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#: po/tmp/task-editor-dialog.glade.h:6
 msgid "% Comp_lete:"
 msgstr "% konХa_no:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "_Stanje:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Ni priХeto"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "_Uvrstitev"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "V teku"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "Preklicano"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "KonХano"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "Preklicano"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "_Prioriteta:"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "KonХano dne:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Visoka"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "ObiХajna"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "V teku"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Nizka"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "_Uvrstitev"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: shell/e-shell-view.c:1017 widgets/misc/e-dateedit.c:212
-#: widgets/misc/e-dateedit.c:371 widgets/misc/e-dateedit.c:1171
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: 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
 msgid "None"
 msgstr "Brez"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "_Stiki..."
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "ObiХajna"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Ni priХeto"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr "_Povzetek"
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr "Datum _priХetka:"
+
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Naloga"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "KonХano dne:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:294
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "_Stiki..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr "_Do datuma:"
+
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "_Prioriteta:"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "_Stanje:"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr "dialog-urejevalnik-dogodkov"
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Uredi nalogo"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Ni povzetka"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Zmenek - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Naloga - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Vpis v dnevniku - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#, fuzzy
+msgid "Do you want to save changes?"
+msgstr "Shranil bom spremembe sporoХila"
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "Odpri..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "Odpri nalogo"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "OznaХi kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "OznaХi nalogo kot opravljeno"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:73 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:8
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:165
-#: ui/evolution-addressbook.h:11 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-event-editor.h:13
-#: ui/evolution-mail.h:13
+#: 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:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Zbri╧i nalogo"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 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:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: 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
 msgid "New appointment..."
 msgstr "Nov zmenek..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "Uredi ta zmenek..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
-#: ui/evolution-event-editor.h:14
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Zbri╧i ta zmenek"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr "Naredi zmenek prestavljiv"
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr "Zbri╧i to pojavitev"
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr "Zbri╧i vse pojavitve"
 
@@ -1965,247 +1947,203 @@ msgstr "Zbri╧i vse pojavitve"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:297
-msgid "Edit Appointment"
-msgstr "Uredi zmenek"
-
-#: calendar/gui/event-editor.c:342
-msgid "on"
-msgstr "na"
-
-#: calendar/gui/event-editor.c:470
-msgid "ocurrences"
-msgstr "pojavitve"
-
-#: calendar/gui/event-editor.c:2399 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
-#. todo
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
-#.
-#. figure out why alarm units aren't sticking between edits
-#.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
 #.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
-msgstr "dialog-urejevalec-dogodkov"
-
-#: calendar/gui/event-editor-dialog.glade.h:8
-#: calendar/gui/event-editor-dialog.glade.h:56
-msgid "Su_mmary:"
-msgstr "_Povzetek:"
-
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "хas"
-
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "_Start time:"
-msgstr "_хas priХetka:"
-
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "_End time:"
-msgstr "_хas konca"
-
-#: calendar/gui/event-editor-dialog.glade.h:12
+#: po/tmp/event-editor-dialog.glade.h:6
 msgid "A_ll day event"
 msgstr "_Celodnevni dogodek"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
+#: po/tmp/event-editor-dialog.glade.h:8
+msgid "Appointment Basics"
+msgstr "Osnove zmenkov"
+
+#: po/tmp/event-editor-dialog.glade.h:9
 msgid "Classification"
 msgstr "Uvrstitev"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
-msgstr "_Javno"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
+msgstr "Ponovitev po meri"
 
-#: calendar/gui/event-editor-dialog.glade.h:15
-msgid "Pri_vate"
-msgstr "Pri_vatno"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "Dni"
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
-msgstr "_Zaupno"
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Vsak"
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:21
-#: calendar/gui/event-editor-dialog.glade.h:24
-#: calendar/gui/event-editor-dialog.glade.h:27
-msgid "Minutes"
-msgstr "Minut"
+#: po/tmp/event-editor-dialog.glade.h:14
+msgid "Exceptions"
+msgstr "Izjeme"
 
-#: calendar/gui/event-editor-dialog.glade.h:19
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:25
-#: calendar/gui/event-editor-dialog.glade.h:28
+#: po/tmp/event-editor-dialog.glade.h:16
 msgid "Hours"
 msgstr "Ur"
 
-#: calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/event-editor-dialog.glade.h:23
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:29
-msgid "Days"
-msgstr "Dni"
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Po╧lji po╧to _za:"
 
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid "_Display"
-msgstr "_Prikaz"
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Minut"
 
-#: calendar/gui/event-editor-dialog.glade.h:31
-msgid "_Program"
-msgstr "_Program"
+#: po/tmp/event-editor-dialog.glade.h:19
+msgid "Modify"
+msgstr "Spremeni"
 
-#: calendar/gui/event-editor-dialog.glade.h:32
-msgid "_Mail"
-msgstr "_Po╧lji po╧to"
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
+msgstr "Ni ponovitev"
 
-#: calendar/gui/event-editor-dialog.glade.h:33
-msgid "Mail _to:"
-msgstr "Po╧lji po╧to _za:"
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "Predogled:"
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Run program:"
-msgstr "_Po╬eni program:"
+#: po/tmp/event-editor-dialog.glade.h:22
+msgid "Pri_vate"
+msgstr "Pri_vatno"
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "_Zvok"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr "_Javno"
 
-#: calendar/gui/event-editor-dialog.glade.h:36
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
+msgstr "Ponovitev"
+
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
+msgstr "Pravilo ponovitev"
+
+#: po/tmp/event-editor-dialog.glade.h:26
 msgid "Reminder"
 msgstr "Opozorilo"
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Recur on the"
-msgstr "Ponovitev na"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr "Enostavna ponovitev"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "th day of the month"
-msgstr "dan v mesecu"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr "_Povzetek:"
 
-#: calendar/gui/event-editor-dialog.glade.h:40 calendar/gui/print.c:288
-msgid "1st"
-msgstr "1."
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "хas"
 
-#: calendar/gui/event-editor-dialog.glade.h:41 calendar/gui/print.c:288
-msgid "2nd"
-msgstr "2."
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "_Zvok"
 
-#: calendar/gui/event-editor-dialog.glade.h:42 calendar/gui/print.c:288
-msgid "3rd"
-msgstr "3."
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr "_Zaupno"
 
-#: calendar/gui/event-editor-dialog.glade.h:43 calendar/gui/print.c:288
-msgid "4th"
-msgstr "4."
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
+msgstr "_Prikaz"
 
-#: calendar/gui/event-editor-dialog.glade.h:44 calendar/gui/print.c:288
-msgid "5th"
-msgstr "5."
+#: po/tmp/event-editor-dialog.glade.h:33
+msgid "_End time:"
+msgstr "_хas konca"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Every"
-msgstr "Vsak"
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "_Po╧lji po╧to"
 
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/event-editor-dialog.glade.h:65
-msgid "month(s)"
-msgstr "mesec"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "_Program"
 
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Recurrence"
-msgstr "Ponovitev"
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "_Po╬eni program:"
 
-#: calendar/gui/event-editor-dialog.glade.h:55
-msgid "Appointment Basics"
-msgstr "Osnove zmenkov"
+#: po/tmp/event-editor-dialog.glade.h:37
+msgid "_Start time:"
+msgstr "_хas priХetka:"
 
-#: calendar/gui/event-editor-dialog.glade.h:57
+#: po/tmp/event-editor-dialog.glade.h:38
 msgid "_Starting date:"
 msgstr "Datum _priХetka:"
 
-#: calendar/gui/event-editor-dialog.glade.h:58
-msgid "Recurrence Rule"
-msgstr "Pravilo ponovitev"
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
+msgstr "dni"
 
-#: calendar/gui/event-editor-dialog.glade.h:59
-msgid "No recurrence"
-msgstr "Ni ponovitev"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr "dialog-urejevalec-dogodkov"
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "Simple recurrence"
-msgstr "Enostavna ponovitev"
+#: po/tmp/event-editor-dialog.glade.h:41
+msgid "for"
+msgstr "za"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-msgid "Custom recurrence"
-msgstr "Ponovitev po meri"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr "vseskozi"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "day(s)"
-msgstr "dni"
+#: po/tmp/event-editor-dialog.glade.h:43
+msgid "label21"
+msgstr "oznaХba21"
+
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "mesec"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr "do"
 
-#: calendar/gui/event-editor-dialog.glade.h:64
+#: po/tmp/event-editor-dialog.glade.h:46
 msgid "week(s)"
 msgstr "tednov"
 
-#: calendar/gui/event-editor-dialog.glade.h:66
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "let"
 
-#: calendar/gui/event-editor-dialog.glade.h:67
-msgid "for"
-msgstr "za"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Uredi zmenek"
 
-#: calendar/gui/event-editor-dialog.glade.h:68
-msgid "until"
-msgstr "do"
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "na"
 
-#: calendar/gui/event-editor-dialog.glade.h:69
-msgid "forever"
-msgstr "vseskozi"
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dan"
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid "Exceptions"
-msgstr "Izjeme"
+#: calendar/gui/event-editor.c:559
+#, fuzzy
+msgid "on the"
+msgstr "mesec"
 
-#: calendar/gui/event-editor-dialog.glade.h:72
-msgid "Modify"
-msgstr "Spremeni"
+#: calendar/gui/event-editor.c:566
+#, fuzzy
+msgid "th"
+msgstr "4."
 
-#: calendar/gui/event-editor-dialog.glade.h:74
-msgid "label21"
-msgstr "oznaХba21"
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
+msgstr "pojavitve"
 
-#: calendar/gui/event-editor-dialog.glade.h:75
-msgid ""
-"This appointment has custom recurrence rules that cannot be edited by "
-"Evolution.\n"
-"\n"
-"However, the appointment will recur at the appropriate time and will be "
-"displayed properly in the calendar views."
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr ""
-"Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana znotraj "
-"Evolucije.\n"
-"\n"
-"Vendar se bo zmenek ponovil pravoХasno in bo  pravilno prikazan v pogledu "
-"koledarja."
+
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
 
 #: calendar/gui/getdate.y:391
 msgid "january"
@@ -2319,10 +2257,6 @@ msgstr "╧tirinajst dni"
 msgid "week"
 msgstr "teden"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:65
-msgid "day"
-msgstr "dan"
-
 #: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "ura"
@@ -2421,53 +2355,29 @@ msgstr "dvanajsti"
 msgid "ago"
 msgstr "nazaj"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr "Ustvari predmet za-opravit"
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr "Uredi predemet za-opravit"
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr "Povzetek:"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "Do datuma:"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Prioriteta:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr "Komentarji predmeta:"
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: 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/gnome-cal.c:1144
+#: 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/gnome-cal.c:1155
+#: 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/gnome-cal.c:1166
+#: 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"
 
 #. Idea: we need Snooze option :-)
-#: calendar/gui/gnome-cal.c:1471 calendar/gui/gnome-cal.c:1526
-#: mail/mail-search-dialogue.c:101
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "V redu"
 
@@ -2494,6 +2404,26 @@ msgstr ""
 msgid "Go to today"
 msgstr "Pojdi na danes"
 
+#: calendar/gui/print.c:288
+msgid "1st"
+msgstr "1."
+
+#: calendar/gui/print.c:288
+msgid "2nd"
+msgstr "2."
+
+#: calendar/gui/print.c:288
+msgid "3rd"
+msgstr "3."
+
+#: calendar/gui/print.c:288
+msgid "4th"
+msgstr "4."
+
+#: calendar/gui/print.c:288
+msgid "5th"
+msgstr "5."
+
 #: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6."
@@ -2662,190 +2592,95 @@ msgstr "Trenutno leto (%Y)"
 msgid "Print Calendar"
 msgstr "Natisni _koledar"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:834
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "Prikaz Хasa"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Oblika izpisa Хasa"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12 urna (dop./pop.)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24 urna"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "Tedni se zaХnejo v"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Razpon dni"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-"Prosim izberite ure zaХetka in konca dneva, ki naj\n"
-"bodo prikazane v dnevnem in tedenskem pogledu.\n"
-"хasi izven tega razpona ne bodo samodejno prikazani"
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr "ZaХetek dneva:"
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr "Konec dneva:"
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr "Barve za prikaz"
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr "Poka╬i v seznamu za-opravit:"
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr "Slog seznama za-opravit:"
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr "Osvetli preteХene predmete"
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr "Osvetli ╧e nepreteХene predmete"
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr "Osvetli predmete z dana╧njim rokom"
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr "Lastnosti seznama Za-opravit"
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr "Seznam Za-opravit"
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Nastavitve"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr "Alarmi"
-
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
-msgid "Alarm Properties"
-msgstr "Lastnosti alarma"
-
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr "Piskaj ob zaslonskih alarmih"
-
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
-msgstr "ZvoХni alarmi preteХejo po"
-
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
-msgstr " sekundah"
-
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
-msgstr "OmogoХi podalj╧anje spanja za "
-
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:326 widgets/misc/e-calendar-item.c:416
+#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
 msgid "MTWTFSS"
 msgstr "PTSхPSN"
 
-#: calendar/gui/weekday-picker.c:328 calendar/gui/weekday-picker.c:418
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 msgid "SMTWTFS"
 msgstr "PTSхPSN"
 
-#: camel/camel-movemail.c:96
-#, c-format
-msgid "Could not check mail file %s: %s"
-msgstr "Nisem mogel preverti po╧tne datoteke %s: %s"
-
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Nisem mogel ustvariti kljuХavniХne datoteke za %s: %s"
 
-#: camel/camel-movemail.c:143
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+"хasovna omejitev je pretekla ob pridobivanju kljuХavnice na %s. Poskusi "
+"znova kasneje."
+
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr "Nisem mogel preverti po╧tne datoteke %s: %s"
+
+#: camel/camel-movemail.c:146
 #, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Nisem mogel odpreti po╧tne datoteke %s: %s"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Nisem mogel odpreti zaХasne po╧tne datoteke %s: %s"
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Nisem mogel preveriti kljuХavniХne datoteke %s: %s"
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-"хasovna omejitev je pretekla ob pridobivanju kljuХavnice na %s. Poskusi "
-"znova kasneje."
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Napaka ob branju po╧tne datoteke: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Napak ob pisanju v zaХasno po╧tno datoteko: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Nisem uspel shraniti po╧te v zaХasno datoteko %s: %s"
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Nisem mogel ustvariti cevi: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Nisem se mogel razvejiti: %s"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Program movemail ni uspel: %s"
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Neznana napaka)"
 
@@ -2878,6 +2713,10 @@ msgstr "Nisem se mogel povezati z %s (vrata %d): %s"
 msgid "(unknown host)"
 msgstr "(neznan gostitelj)"
 
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
 #: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
@@ -2903,12 +2742,12 @@ msgstr "Ni tak╧nega gostitelja %s."
 msgid "Temporarily unable to look up hostname %s."
 msgstr "Trenutno ne morem poizvedeti po gostitelju %s."
 
-#: camel/camel-session.c:271
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Noben nuditelj za protokol '%s' ni dostopen"
 
-#: camel/camel-session.c:359
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2917,21 +2756,33 @@ msgstr ""
 "Ne morem ustvariti imenika %s:\n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "URL niz '%s' ne vsebuje protokola"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "URL niz '%s' vsebuje neveljaven protokol"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:154
 #, c-format
 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
+#, 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
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "NepriХakovan odgovor stre╬nika IMAP: %s"
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2942,16 +2793,21 @@ msgstr "NepriХakovan odgovor stre╬nika IMAP: %s"
 msgid "IMAP command failed: %s"
 msgstr "IMAP ukaz ni uspel: %s"
 
-#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:349
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: camel/providers/imap/camel-imap-command.c:366
+#: camel/providers/imap/camel-imap-command.c:271
+#, fuzzy
+msgid "Server response ended too soon."
+msgstr "odgovor IMAP stre╬nika ni vseboval podatkov %s"
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, 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:402
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "NepriХakovan OK odgovor stre╬nika IMAP: %s"
@@ -2961,7 +2817,7 @@ msgstr "NepriХakovan OK odgovor stre╬nika IMAP: %s"
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel nalo╬iti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:581
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporoХila v FETCH odgovoru."
 
@@ -3014,50 +2870,200 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "Nisem mogel ustvariti povzetka"
+#: camel/providers/local/camel-local-provider.c:36
+#, fuzzy
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "UNIX MH-oblika po╧tnih imenikov"
+
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "Za shranjevanje krajevne po╧te v po╧tnih imenikih enakih MH-jevim"
+
+#: camel/providers/local/camel-local-provider.c:47
+#, fuzzy
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "UNIX mbox-oblikovane po╧tne datoteke"
+
+#: camel/providers/local/camel-local-provider.c:48
+#, fuzzy
+msgid "For storing local mail in standard mbox format"
+msgstr "Za shranjevanje krajevne po╧te v po╧tnih imenikih enakih MH-jevim"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+#, fuzzy
+msgid "For storing local mail in qmail maildir directories"
+msgstr "Za shranjevanje krajevne po╧te v po╧tnih imenikih enakih MH-jevim"
 
-#: camel/providers/mbox/camel-mbox-folder.c:389
-#: camel/providers/mbox/camel-mbox-folder.c:392
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Ne morem pripeti sporoХila mbox datoteki: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "`%s' ni obiХajna datoteka."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Ne morem razvejiti %s: %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+#, fuzzy
+msgid "Local folders may not be nested."
+msgstr "Mbox map ni mogoХe gnezditi."
 
-#: camel/providers/mbox/camel-mbox-folder.c:496
+#: camel/providers/local/camel-local-store.c:200
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Ne morem dobiti sporoХila: %s"
+msgid "Local mail file %s"
+msgstr "Krajevna datoteka s po╧to %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "UNIX mbox-oblikovane po╧tne datoteke"
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Nisem mogel preimenovati mape `%s': %s"
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Nisem mogel zbrisati mape `%s': %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Nisem mogel zbrisati mape `%s': %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Ne morem dobiti sporoХila: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
 msgstr ""
-"Za branje po╧te dostavljene na krajevni sistem in za shranjevanje po╧te na "
-"krajevni disk."
 
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Ne morem odpreti datoteke '%s':\n"
+"Nisem mogel odpreti imenika `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mapa `%s' ne obstaja."
 
-#: camel/providers/mbox/camel-mbox-store.c:134
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Nisem mogel ustvariti mape `%s':\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "`%s' ni imenik."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Nisem mogel zbrisati mape `%s': %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Krajevni po╧tni imenik %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Ne morem dobiti sporoХila: %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Ne morem odpreti datoteke '%s':\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -3066,14 +3072,14 @@ msgstr ""
 "Nisem mogel ustvariti datoteke `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ni obiХajna datoteka."
 
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -3082,151 +3088,89 @@ msgstr ""
 "Nisem mogel zbrisati mape `%s':\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:184
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mapa `%s' ni prazna. Ni zbrisana."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Nisem mogel preimenovati mape %s v %s: cilj ╬e obstaja"
-
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox map ni mogoХe gnezditi."
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Nisem mogel odpreti mape: seznam sporoХil je bil nepopoln."
 
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:268
 #, c-format
-msgid "Local mail file %s"
-msgstr "Krajevna datoteka s po╧to %s"
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
-#, c-format
-msgid "Could not open summary %s"
-msgstr "Nisem mogel odpreti povzetka %s"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, 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
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+"Nisem mogel odpreti imenika `%s':\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:688
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Nisem mogel odpreti zaХasnega po╧tnega predala: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
+#: 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
+#, fuzzy
+msgid "Summary and folder mismatch, even after a sync"
 msgstr "Povzetek se ne ujema, prekinjam sinhronizacijo"
 
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Povzetek se ne ujema, X-Evolution glava manjka"
-
-#: camel/providers/mbox/camel-mbox-summary.c:776
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Napaka ob pisanju v zaХasni po╧tni predal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Ne morem kopirati podatkov v izhodno datoteko: %s"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Napaka ob pisanju v zaХasni po╧tni predal: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:832
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Nisem mogel zapreti izvorne mape %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:841
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Nisem mogel zapreti zaХasne mape: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:849
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:861
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Neznana napaka: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "Nisem mogel nalo╬iti ali ustvariti povzetka"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ne morem dodati sporoХila v mh mapo: %s"
 
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Ne morem dobiti sporoХila: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "UNIX MH-oblika po╧tnih imenikov"
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "Za shranjevanje krajevne po╧te v po╧tnih imenikih enakih MH-jevim"
-
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel odpreti imenika `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:127
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Nisem mogel ustvariti mape `%s':\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:136
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "`%s' ni imenik."
 
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Nisem mogel zbrisati mape `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Nisem mogel preimenovati mape `%s': %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Nisem mogel preimenovati mape `%s': %s ╬e obstaja"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH mape ne morejo biti gnezdene"
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Krajevni po╧tni imenik %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3244,7 +3188,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:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "SporoХilo %s ni bilo najdeno."
@@ -3295,16 +3239,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:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 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:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ni sporoХila z uid %s"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr "Nisem uspel prenesti sporoХila z POP stre╬nika %s: %s"
@@ -3393,7 +3337,7 @@ msgstr ""
 "Nisem se mogel povezati s stre╬nikom POP.\n"
 "Napaka ob po╧iljanju gesla: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:553
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr "Ni tak╧ne mape `%s'."
@@ -3462,108 +3406,107 @@ msgstr "Nuditelj virutalne mape e-po╧te"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Za branje po╧te kot poizvedbe po drugem sklopu map"
 
-#: composer/e-msg-composer-attachment-bar.c:86
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 bajt"
 
-#: composer/e-msg-composer-attachment-bar.c:88
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bajtov"
 
-#: composer/e-msg-composer-attachment-bar.c:95
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:99
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:300 mail/mail-display.c:116
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "priloga"
 
-#: composer/e-msg-composer-attachment-bar.c:396
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Prilo╬i datoteko"
 
-#: composer/e-msg-composer-attachment-bar.c:443 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/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:444
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Odstrani izbrane predmete iz seznama prilog"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Dodaj prilogo..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Prilo╬i datoteko k sporoХilu"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Lastnosti priloge"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "MIME tip:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Ime datoteke:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
-#: mail/mail-format.c:589
+#: po/tmp/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
 msgid "From:"
 msgstr "Od:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Kliknite tu za adresar"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 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:300 mail/mail-format.c:602
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "Za:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporoХila"
 
-#: composer/e-msg-composer-hdrs.c:305 mail/mail-format.c:609
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 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:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3571,15 +3514,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:318 mail/mail-format.c:614
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Vnesite zadevo sproХila"
 
-#: composer/e-msg-composer.c:302
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3588,38 +3531,38 @@ msgstr ""
 "Nisem mogel odpreti datoteke s podpisom %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:458
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: composer/e-msg-composer.c:469
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Napak ob shranjevanju datoteke: %s"
 
-#: composer/e-msg-composer.c:489
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Napaka ob nalaganju datoteke %s"
 
-#: composer/e-msg-composer.c:511
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Shranjujem spremembe sporoХila..."
 
-#: composer/e-msg-composer.c:513
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Shranjujem spremembe sporoХila..."
 
-#: composer/e-msg-composer.c:554
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Napaka ob shranjevanju kompozicije v 'Osnutki': %s"
 
-#: composer/e-msg-composer.c:598 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:604
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3629,27 +3572,27 @@ msgstr ""
 "\n"
 "╝elite shraniti spremembe?"
 
-#: composer/e-msg-composer.c:626
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "Odpri datoteko"
 
-#: composer/e-msg-composer.c:752
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Datoteka ne obstaja."
 
-#: composer/e-msg-composer.c:762
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "To ni obiХajna datoteka."
 
-#: composer/e-msg-composer.c:772
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Ta datoteka obstaja a ni berljiva."
 
-#: composer/e-msg-composer.c:782
+#: composer/e-msg-composer.c:923
 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:804
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3657,15 +3600,15 @@ msgstr ""
 "Datoteka je zelo velika (Хez 100K).\n"
 "Ste prepriХani,da jo ╬elite vstaviti?"
 
-#: composer/e-msg-composer.c:825
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Ob branju datoteke se je zgodila napaka."
 
-#: composer/e-msg-composer.c:1197
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Sestavi novo sporoХilo"
 
-#: composer/e-msg-composer.c:1271
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Nisem mogel ustvariti okna skladatelja."
 
@@ -3673,6 +3616,11 @@ msgstr "Nisem mogel ustvariti okna skladatelja."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Ne morem inicializirati Evolucijinega skladatelja."
 
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "I╧Хi"
+
 #: filter/filter-datespec.c:62
 msgid "years"
 msgstr "let"
@@ -3759,8 +3707,8 @@ msgstr "Primerjaj z"
 msgid "<click here to select a date>"
 msgstr "<kliknite tukaj za izbiro datuma>"
 
-#: filter/filter-editor.c:160 mail/mail-autofilter.c:289
-#: mail/mail-autofilter.c:338
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
@@ -3768,12 +3716,17 @@ msgstr "Filtru dodaj pravilo"
 msgid "Edit Filter Rule"
 msgstr "Uredi pravilo filtra"
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: filter/filter-editor.c:456 filter/filter.glade.h:7
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr "Grupiranje"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
 msgstr "Uredi filtre"
 
@@ -3798,19 +3751,19 @@ msgstr ""
 "Opa, pozabili ste izbrati mapo.\n"
 "Prosim pojdite nazaj in navedite veljavno mapo kamor naj se po╧ta dostavi."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Vnesite URI mape"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: filter/filter-input.c:188
+#: filter/filter-input.c:184
 #, c-format
 msgid ""
 "Error in regular expression '%s':\n"
@@ -3819,7 +3772,12 @@ msgstr ""
 "Napaka v regularnem izrazu '%s':\n"
 "%s"
 
-#: filter/filter-part.c:458
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Preizkus"
 
@@ -3831,238 +3789,228 @@ msgstr "Ime pravila: "
 msgid "Untitled"
 msgstr "Neimenovan"
 
-#: filter/filter-rule.c:538
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr "хe"
 
-#: filter/filter-rule.c:555
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr "Izvr╧i dejanja"
 
-#: filter/filter-rule.c:559
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr "Хe je zado╧Хeno vsem pogojem"
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr "Хe je zaddo╧Хeno kateremukoli pogoju"
 
-#: filter/filter-rule.c:575
+#: filter/filter-rule.c:577
 msgid "Add criterion"
 msgstr "Dodaj pogoj"
 
-#: filter/filter-rule.c:581
+#: filter/filter-rule.c:583
 msgid "Remove criterion"
 msgstr "Odstrani pogoj"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-"Prihodna\n"
-"Odhodna\n"
-
-#: filter/filter.glade.h:11
-msgid "Filter Rules"
-msgstr "Pravila filtriranja"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Uredi"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:10
 msgid "Edit VFolders"
 msgstr "Uredi vMape"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:11
+msgid "Filter Rules"
+msgstr "Pravila filtriranja"
+
+#: po/tmp/filter.glade.h:12
+#, fuzzy
+msgid "Incoming"
+msgstr ""
+"Prihodna\n"
+"Odhodna\n"
+
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "Obroba:"
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "Virtualne mape"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: po/tmp/filter.glade.h:16
 msgid "vFolder Sources"
 msgstr "Viri vMap"
 
 #. Automatically generated. Do not edit.
-#: filter/libfilter-i18n.h:2 mail/message-list.c:511
-msgid "Answered"
-msgstr "Odgovorjeno"
-
-#: filter/libfilter-i18n.h:3
+#: filter/libfilter-i18n.h:2
 msgid "Assign Colour"
 msgstr "Pripi╧i barvo"
 
-#: filter/libfilter-i18n.h:4
+#: filter/libfilter-i18n.h:3
 msgid "Assign Score"
 msgstr "Pripi╧i toХke"
 
-#: filter/libfilter-i18n.h:5
+#: filter/libfilter-i18n.h:4
 msgid "Copy to Folder"
 msgstr "Kopiraj v mapo"
 
-#: filter/libfilter-i18n.h:6
+#: filter/libfilter-i18n.h:5
 msgid "Date received"
 msgstr "Sprejeto dne"
 
-#: filter/libfilter-i18n.h:7
+#: filter/libfilter-i18n.h:6
 msgid "Date sent"
 msgstr "Poslano dne"
 
-#: filter/libfilter-i18n.h:9
-msgid "Deleted"
-msgstr "Zbrisano"
-
-#: filter/libfilter-i18n.h:10
-msgid "Draft"
-msgstr "Osnutek"
-
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:8
 msgid "Expression"
 msgstr "Izraz"
 
-#: filter/libfilter-i18n.h:12
-msgid "Flagged"
-msgstr "OznaХeno"
-
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:9
 msgid "Forward to Address"
 msgstr "Posreduj na naslove"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:10
 msgid "Message Body"
 msgstr "Jedro sporoХila"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Jedro sporoХila"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "SporoХilo je bilo sprejeto"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "SporoХilo je bilo poslano"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Prestavi v mapo"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Prejemniki"
 
-#: filter/libfilter-i18n.h:20 mail/message-list.c:508
-msgid "Seen"
-msgstr "Videno"
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "Po╧iljatelj"
 
-#: filter/libfilter-i18n.h:22
-msgid "Set Flag"
-msgstr "Postavi oznaХbo"
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Stanje priklopa"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Vir"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr "DoloХena glava"
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "_Stanje:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Zadeva"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:25
 msgid "after"
 msgstr "po"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr "pred"
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:27
 msgid "contains"
 msgstr "vsebuje"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr "ne vsebuje"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:29
 msgid "does not end with"
 msgstr "se ne konХa z"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:30
 msgid "does not exist"
 msgstr "ne obstaja"
 
-#: filter/libfilter-i18n.h:33
-msgid "does not match regex"
-msgstr "ne ustreza z regularnemu izrazu"
-
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:31
 msgid "does not sound like"
 msgstr "ne zveni kot"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:32
 msgid "does not start with"
 msgstr "se ne zaХne z"
 
-#: filter/libfilter-i18n.h:36
+#: filter/libfilter-i18n.h:33
 msgid "ends with"
 msgstr "se konХa z"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:34
 msgid "exists"
 msgstr "obstaja"
 
-#: filter/libfilter-i18n.h:38
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr "je veХje"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr "je manj╧e"
 
-#: filter/libfilter-i18n.h:40
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr "ni"
 
-#: filter/libfilter-i18n.h:41
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr "je"
 
-#: filter/libfilter-i18n.h:42
-msgid "matches regex"
-msgstr "ustreza regularnemu izrazu"
-
-#: filter/libfilter-i18n.h:43
+#: filter/libfilter-i18n.h:39
 msgid "on or after"
 msgstr "na ali po"
 
-#: filter/libfilter-i18n.h:44
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr "na ali pred"
 
-#: filter/libfilter-i18n.h:45
+#: filter/libfilter-i18n.h:41
 msgid "sounds like"
 msgstr "zveni kot"
 
-#: filter/libfilter-i18n.h:46
+#: filter/libfilter-i18n.h:42
 msgid "starts with"
 msgstr "se zaХne z"
 
-#: filter/libfilter-i18n.h:47
+#: filter/libfilter-i18n.h:43
 msgid "was after"
 msgstr "je bilo po"
 
-#: filter/libfilter-i18n.h:48
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr "je bilo pred"
 
@@ -4086,161 +4034,156 @@ msgstr "Dodaj pravilo vMape"
 msgid "Edit VFolder Rule"
 msgstr "Uredi pravilo vMape"
 
-#: mail/component-factory.c:230
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Ne morem inicializirati Evolution komponente za po╧to."
 
-#: mail/component-factory.c:236
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Ne morem inicializirati Evolution komponente za povzemanje po╧te."
-
-#: mail/component-factory.c:241
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Ne morem inicializirati Evolution komponente za razpr╧eno shrambo."
-
-#: mail/component-factory.c:279
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "Ne morem registrirati shrambe z lupino"
 
-#: mail/folder-browser.c:143
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
+msgstr "Shrani"
+
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr "Telo ali zadeva vsebuje"
 
-#: mail/folder-browser.c:144
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Telo vsebuje"
 
-#: mail/folder-browser.c:145
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
-#: mail/folder-browser.c:146
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Telo ne vsebuje"
 
-#: mail/folder-browser.c:147
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Zadeva ne vsebuje"
 
-#: mail/folder-browser.c:148
-msgid "Custom search"
-msgstr "Iskanje po meri"
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr "vMapa glede na Zadevo"
 
-#: mail/folder-browser.c:320
-msgid "Custom"
-msgstr "Po meri"
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr "vMapa glede na Po╧iljatelja"
 
-#: mail/folder-browser.c:478
-msgid "Open in New Window"
-msgstr "Odpri v novem oknu"
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr "vMapa glede na Prejemnika"
 
-#: mail/folder-browser.c:479
-msgid "Edit Message"
-msgstr "Uredi sporoХilo"
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr "Filter glede na Zadevo"
 
-#: mail/folder-browser.c:480 mail/mail-callbacks.c:794
-msgid "Print Message"
-msgstr "Natisni sporoХilo"
+#: mail/folder-browser.c:458
+msgid "Filter on Sender"
+msgstr "Filter glede na Po╧iljatelja"
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr "Filter glede na Prejemnike"
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+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
+#, fuzzy
+msgid "Open"
+msgstr "_Odpri"
 
-#: mail/folder-browser.c:482
+#: mail/folder-browser.c:466
+#, 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
+msgid "Print"
+msgstr "Natisni"
+
+#: mail/folder-browser.c:469
 msgid "Reply to Sender"
 msgstr "Odgovori po╧iljatelju"
 
-#: mail/folder-browser.c:483 mail/mail-view.c:156 ui/evolution-mail.h:35
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Reply to All"
 msgstr "Odgovori vsem"
 
-#: mail/folder-browser.c:484
-msgid "Forward Message"
-msgstr "SporoХilo posreduj naprej"
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr "Posreduj naprej"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Pojdi po Хasu naprej"
 
-#: mail/folder-browser.c:486
+#: mail/folder-browser.c:474
 msgid "Mark as Read"
 msgstr "OznaХi kot prebrano"
 
-#: mail/folder-browser.c:487
+#: mail/folder-browser.c:475
 msgid "Mark as Unread"
 msgstr "OznaХi kot neprebrano"
 
-#: mail/folder-browser.c:488
-msgid "Delete Message"
-msgstr "Zbri╧i sporХilo"
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Prestavi v mapo"
 
-#: mail/folder-browser.c:489
-msgid "Move Message"
-msgstr "Prestavi sporoХilo"
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Kopiraj v mapo"
 
-#: mail/folder-browser.c:490
-msgid "Copy Message"
-msgstr "Kopiraj sporoХilo"
+#: mail/folder-browser.c:480
+#, fuzzy
+msgid "Undelete"
+msgstr "Zbri╧i"
 
-#: mail/folder-browser.c:491
+#. { _("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
 msgid "Apply Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/folder-browser.c:493
-msgid "VFolder on Subject"
-msgstr "vMapa glede na Zadevo"
-
-#: mail/folder-browser.c:494
-msgid "VFolder on Sender"
-msgstr "vMapa glede na Po╧iljatelja"
-
-#: mail/folder-browser.c:495
-msgid "VFolder on Recipients"
-msgstr "vMapa glede na Prejemnika"
-
-#: mail/folder-browser.c:497
-msgid "Filter on Subject"
-msgstr "Filter glede na Zadevo"
-
-#: mail/folder-browser.c:498
-msgid "Filter on Sender"
-msgstr "Filter glede na Po╧iljatelja"
-
-#: mail/folder-browser.c:499
-msgid "Filter on Recipients"
-msgstr "Filter glede na Prejemnike"
-
-#: mail/folder-browser.c:500 mail/folder-browser.c:523
-msgid "Filter on Mailing List"
-msgstr "Filter glede na Po╧tni seznam"
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
 
-#: mail/folder-browser.c:525
+#: mail/folder-browser.c:546
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filter glede na Po╧tni seznam (%s)"
 
-#: mail/folder-browser.c:641
-msgid "Full Search"
-msgstr "Polno iskanje"
-
-#.
-#. *  This file is autogenerated from evolution-event-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: mail/folder-browser.c:646 ui/evolution-event-editor.h:9
-msgid "Save"
-msgstr "Shrani"
-
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr "Po╧ta za %s"
 
 #: mail/mail-autofilter.c:214
+#, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:232
+#: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr "Po╧ta od %s"
 
-#: mail/mail-autofilter.c:334
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr "%s po╧tnih seznamov"
@@ -4297,15 +4240,15 @@ msgstr ""
 msgid "You must specify recipients in order to send this message."
 msgstr "Navesti morate naslovnike, Хe ╬eliti poslati sporoХilo."
 
-#: mail/mail-callbacks.c:533
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Prestavi sporoХilo(a) v"
 
-#: mail/mail-callbacks.c:535
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Kopiraj sporoХilo(a) v"
 
-#: mail/mail-callbacks.c:650
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4313,7 +4256,29 @@ msgstr ""
 "Urejate lahko le sporoХila shranjena\n"
 "v mapi Osnutki."
 
-#: mail/mail-callbacks.c:749
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "Prepi╧i datoteko?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Mapa z enakim imenom ╬e obstaja.\n"
+"Naj jo prepi╧em?"
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Shrani kot..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Shrani kot..."
+
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4322,11 +4287,47 @@ msgstr ""
 "Napaka ob nalaganju podatkov o filtrih:\n"
 " %s"
 
-#: mail/mail-callbacks.c:841
+#: mail/mail-callbacks.c:922
+msgid "Print Message"
+msgstr "Natisni sporoХilo"
+
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Tiskanje sporoХila ni uspelo"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr "Identiteta"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "Nastavitev _po╧te"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "Izvor po╧te"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "Prenos Po╧te"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+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"
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -4336,59 +4337,63 @@ msgstr ""
 "╬elji lahko vnesete tudi ime va╧e organizacije in ime datoteke iz katere naj "
 "se prebere va╧ podpis."
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Polno ime:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "E-po╧tni naslov:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Datoteka s podpisom:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Datoteka s podpisom"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Stre╬nik:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Uporabni╧ko ime:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Pot:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Avtentikacija:"
 
-#: mail/mail-config-gui.c:940
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Ugotovi podprte tipe..."
 
-#: mail/mail-config-gui.c:967
+#: 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"
 
-#: mail/mail-config-gui.c:979
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "Preveri nastavitve"
 
-#: mail/mail-config-gui.c:1106
+#: mail/mail-config-gui.c:1130
 msgid "Mail source type:"
 msgstr "Tip izvora po╧te:"
 
-#: mail/mail-config-gui.c:1111 mail/mail-config-gui.c:1159
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -4402,11 +4407,11 @@ msgstr ""
 "хe stre╬nik potrebuje avtentifikacijo, lako kliknete na gumb \"Ugotovi "
 "podprte tipe...\" potem, ko boste vnesli ostale podatke."
 
-#: mail/mail-config-gui.c:1130
+#: mail/mail-config-gui.c:1154
 msgid "News source type:"
 msgstr "Tip izvora noviХk:"
 
-#: mail/mail-config-gui.c:1135
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -4420,186 +4425,112 @@ msgstr ""
 "хe stre╬nik potrebuje avtentikacijo, lako kliknete na gumb \"Ugotovi podprte "
 "tipe...\", po tem ko boste vnesli ostale podatke."
 
-#: mail/mail-config-gui.c:1154
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr "Tip prenosa po╧te:"
 
-#: mail/mail-config-gui.c:1209
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Dodaj identiteto"
 
-#: mail/mail-config-gui.c:1211
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr "Uredi identiteto"
 
-#: mail/mail-config-gui.c:1309
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Dodaj izvor"
 
-#: mail/mail-config-gui.c:1311
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Uredi izbor"
 
-#: mail/mail-config-gui.c:1406
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Dodaj noviХarski stre╬nik"
 
-#: mail/mail-config-gui.c:1408
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Uredi noviХarski stre╬nik"
 
-#: mail/mail-config-gui.c:2232
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Preizku╧am \"%s\""
 
-#: mail/mail-config-gui.c:2234
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr "Preizkusi povezavo z \"%s\""
 
-#: mail/mail-config-gui.c:2275
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr "Povezava je bila uspe╧na!"
 
-#: mail/mail-config-gui.c:2325
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr "Poizvedujem o mo╬nostih avtentifikacije pri \"%s\""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 msgstr "Poizvedi o mo╬nostih avtentifikacije pri \"%s\""
 
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr "Nastavitev _po╧te"
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-"Dobrodo╧li v nastavitvenem Хarovniku po╧te!\n"
-"Z vpisom nekaterih podatkov o va╧ih nastavitvah e-po╧te\n"
-"lahko takoj priХnete po╧iljati in sprejemati po╧to\n"
-"Kliknite naprej za nadaljevanje."
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr "Identiteta"
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr "Izvor po╧te"
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr "Prenos Po╧te"
-
-#: mail/mail-config-druid.glade.h:17
-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"
-
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr "Identitete"
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Naslov"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Organizacija"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Viri"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr "Identitete"
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Izvori po╧te"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/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
 msgid "News Servers"
 msgstr "NoviХarski stre╬niki"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Viri novic"
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "Organizacija"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "Po╧iljaj sporoХila v HTML obliki"
 
-#: mail/mail-config.glade.h:27
-msgid "Mark message as seen [ms]: "
-msgstr "OznaХi sporoХilo kot viden [ms]:"
-
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Nisem mogel ustvariti cevi do %s: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Nisem mogel izvr╧iti %s: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Ne morem razvejiti %s: %s"
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Viri"
 
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Prosim vpi╧ite svojo PGP/GPG geslo za dostop do kljuХa"
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Geslo ni bilo dano."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Nisem mogel ustvariti cevi do GPG/PGP: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "GPG/PGP program ni na voljo."
 
-#: mail/mail-display.c:66
-msgid "Overwrite file?"
-msgstr "Prepi╧i datoteko?"
-
-#: mail/mail-display.c:70
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Mapa z enakim imenom ╬e obstaja.\n"
-"Naj jo prepi╧em?"
-
-#: mail/mail-display.c:84
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4608,122 +4539,127 @@ msgstr ""
 "Nisem mogel odpreti datoteke: %s:\n"
 "%s"
 
-#: mail/mail-display.c:96
+#: mail/mail-display.c:113
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-display.c:192
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Shrani prilogo"
 
-#: mail/mail-display.c:232
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Nisem mogel ustvariti zaХasnega imenika: %s"
 
-#: mail/mail-display.c:274
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Shrani na disk..."
 
-#: mail/mail-display.c:276
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/mail-display.c:278
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr "Poglej vsebino"
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr "Zunanji pregledovalec"
 
-#: mail/mail-display.c:325
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Poglej vsebino (z %s)"
 
-#: mail/mail-display.c:329
+#: mail/mail-display.c:355
 msgid "Hide"
 msgstr "Skrij"
 
-#: mail/mail-format.c:478
+#: mail/mail-format.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s priloga"
 
-#: mail/mail-format.c:595
+#: mail/mail-format.c:623
 msgid "Reply-To:"
 msgstr "Odgovori-na:"
 
-#: mail/mail-format.c:835
+#: mail/mail-format.c:845
 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:847
+#: mail/mail-format.c:857
 msgid "Encrypted message not displayed"
 msgstr "╘ifrirano sporoХilo ni prikazano"
 
-#: mail/mail-format.c:853
+#: mail/mail-format.c:863
 msgid "Encrypted message"
 msgstr "╘ifrirano sporoХilo"
 
-#: mail/mail-format.c:854
+#: mail/mail-format.c:864
 msgid "Click icon to decrypt."
 msgstr "Kliknite ikono za de╧ifriranje."
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/mail-format.c:1468
+#: mail/mail-format.c:1482
 #, 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:1472
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/mail-format.c:1506
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (tip \"%s\")"
 
-#: mail/mail-format.c:1511
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "NapaХno oblikovano dodatno telo sporoХila."
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Spreminjam obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Spremeni obliko zapisa mape iz \"%s\" v \"%s\""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Zapiram trenutno mapo"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Preimenujem in odpiram staro mapo"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Kopiram sporoХilo"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:341
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4732,7 +4668,7 @@ msgstr ""
 "Nisem mogel shraniti meta podatkov mape; verjetno ne boste veХ mogli odpreti "
 "te mape: %s"
 
-#: mail/mail-local.c:443
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4740,281 +4676,306 @@ msgstr ""
 "хe ne morete veХ odpreti tega po╧tnega predala, potem\n"
 "ga boste morda morali popraviti roХno."
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr " (XXX neprebran)"
+#: mail/mail-local.c:781
+#, fuzzy
+msgid "Registering local folder"
+msgstr "Ustvari novo mapo"
+
+#: mail/mail-local.c:783
+#, fuzzy
+msgid "Register local folder"
+msgstr "Ustvari novo mapo"
 
-#: mail/mail-ops.c:69
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr "Pobiram po╧to iz %s"
 
-#: mail/mail-ops.c:71
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr "Poberi po╧to iz %s"
 
-#: mail/mail-ops.c:311
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr "Ni nove po╧te na %s."
 
-#: mail/mail-ops.c:366
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr "Filtriram po╧to na zahtevo"
 
-#: mail/mail-ops.c:368
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr "Fitriraj po╧to na zahtevo"
 
-#: mail/mail-ops.c:500
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "Po╧iljam \"%s\""
 
-#: mail/mail-ops.c:505
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr "Po╧iljam sporoХilo brez navedene zadeve"
 
-#: mail/mail-ops.c:508
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "Po╧lji \"%s\""
 
-#: mail/mail-ops.c:511
+#: mail/mail-ops.c:549
 msgid "Send a message without a subject"
 msgstr "Po╧lji sporoХilo brez navedene zadeve"
 
-#: mail/mail-ops.c:682
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr "Po╧iljam vrsto"
 
-#: mail/mail-ops.c:684
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr "Po╧lji vrsto"
 
-#: mail/mail-ops.c:820 mail/mail-ops.c:827
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Dodajam \"%s\""
 
-#: mail/mail-ops.c:824 mail/mail-ops.c:830
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr "Dodajam sporoХilo brez navedene zadeve"
 
-#: mail/mail-ops.c:902
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr "UniХujem \"%s\""
 
-#: mail/mail-ops.c:904
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr "UniХi \"%s\""
 
-#: mail/mail-ops.c:963
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Prestavljam sporoХila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:965
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Kopiram sporoХila iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1006
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Prestavi sporoХilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:970
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Kopiraj sporoХilo iz \"%s\" v \"%s\""
 
-#: mail/mail-ops.c:1001
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Prestavljam"
 
-#: mail/mail-ops.c:1004
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Kopiram"
 
-#: mail/mail-ops.c:1024
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s sporoХilo %d od %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1103
+#: mail/mail-ops.c:1141
 #, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Izbiram sporoХila v mapi \"%s\""
 
-#: mail/mail-ops.c:1106
+#: mail/mail-ops.c:1144
 #, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Izberi sporoХila v mapi \"%s\""
 
-#: mail/mail-ops.c:1137
+#: mail/mail-ops.c:1175
 #, c-format
 msgid "Marking message %d of %d"
 msgstr "Izbiram sporoХilo %d od %d"
 
-#: mail/mail-ops.c:1260
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Osve╬ujem mape v \"%s\""
 
-#: mail/mail-ops.c:1262
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr "Osve╬i mape v \"%s\""
 
-#: mail/mail-ops.c:1331 mail/subscribe-dialog.c:324
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(ni opisa)"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Prilagam sporoХilo iz mape \"%s\""
 
-#: mail/mail-ops.c:1395
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Prilo╬i sporoХilo iz mape \"%s\""
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Posredujem sporoХilo \"%s\""
 
-#: mail/mail-ops.c:1503
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Posredujem sporoХilo brez navedene zadeve"
 
-#: mail/mail-ops.c:1506
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Posreduj sporoХilo \"%s\""
 
-#: mail/mail-ops.c:1511
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Posreduj sporoХilo brez navedene zadeve"
 
-#: mail/mail-ops.c:1548
+#: 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:1565
+#: 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:1651
+#: mail/mail-ops.c:1665
+#, 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:1653
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Nalo╬i \"%s\""
 
-#: mail/mail-ops.c:1755
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Ustvarjam \"%s\""
 
-#: mail/mail-ops.c:1757
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Ustvari \"%s\""
 
-#: mail/mail-ops.c:1805
+#: 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:1851
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Uskljajujem \"%s\""
 
-#: mail/mail-ops.c:1853
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Uskladi \"%s\""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Prikazujem sporoХilo z UID \"%s\""
 
-#: mail/mail-ops.c:1920
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "хistim prikazano sporoХilo"
 
-#: mail/mail-ops.c:1923
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Prika╬i sporoХilo z UID \"%s\""
 
-#: mail/mail-ops.c:1926
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "хisti prikaz sporoХila"
 
-#: mail/mail-ops.c:2039
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "Odpiram sporoХila iz  mape \"%s\""
 
-#: mail/mail-ops.c:2042
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "Odpri sporoХilo iz \"%s\""
 
-#: mail/mail-ops.c:2146
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "Nalagam mapo %s "
 
-#: mail/mail-ops.c:2148
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "Nalo╬i mapo %s"
 
-#: mail/mail-ops.c:2215
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Gledam sporoХilo iz mape \"%s\""
 
-#: mail/mail-ops.c:2218
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Glej sporoХilo iz \"%s\""
 
-#: mail/mail-ops.c:2244
+#: 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-search-dialogue.c:101
+#: 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:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Odpiram sporoХila iz  mape \"%s\""
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Prena╧am sporoХilo %d od %d (uid \"%s\")"
+
+#: mail/mail-search-dialogue.c:104
 msgid "Cancel"
 msgstr "PrekliХi"
 
-#: mail/mail-summary.c:97 mail/mail-threads.c:703
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "V cev je bilo zapisano nepopolno sporoХilo!"
 
-#: mail/mail-summary.c:370
-msgid "Mailbox summary"
-msgstr "Povzetek po╧tnega predala"
-
 #: mail/mail-threads.c:301
 #, c-format
 msgid ""
@@ -5024,7 +4985,7 @@ msgstr ""
 "Napaka ob pripravljanju na %s:\n"
 "%s"
 
-#: mail/mail-threads.c:650
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -5033,34 +4994,34 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: mail/mail-threads.c:707
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr "Napaka ob branju ukazov iz razpo╧iljalne niti."
 
-#: mail/mail-threads.c:772
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "Prispelo pokvarjeno sporoХilo iz razpo╧iljalne niti?"
 
-#: mail/mail-threads.c:891
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Nisem mogel ustvariti dialoga."
 
-#: mail/mail-threads.c:902
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "Uporabnik je preklical poizvedbo."
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 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:264
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "PreuХujem %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
@@ -5069,46 +5030,41 @@ msgstr ""
 "dobilipodvojeno sporoХilo."
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:290
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Prena╧am sporoХilo %d od %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:303
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Pi╧em sporoХilo %d od %d"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:332
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Shranjujem spremembe pri %s"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:369
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (posredovano sporoХilo)"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr "Posreduj: (ni zadeve)"
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:418
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Posredovano sporoХilo %s"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:420
 msgid "Forwarded message (no subject)"
 msgstr "Posredovano sporoХilo (brez navedene zadeve)"
 
-#: mail/mail-tools.c:510
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr "Ne poznam protokola za odpiranje URIja `%s'"
-
-#: mail/mail-tools.c:539
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5121,65 +5077,72 @@ msgstr ""
 msgid "VFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 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 ui/evolution-mail.h:34
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/mail-view.c:153 ui/evolution-mail.h:39
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr "Odgovori po╧iljatelju tega sporoХila"
 
-#: mail/mail-view.c:156 ui/evolution-mail.h:38
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr "Odgovori vsem prejemnikom tega sporoХila"
 
-#: mail/mail-view.c:159 ui/evolution-mail.h:19
-msgid "Forward"
-msgstr "Posreduj naprej"
-
-#: mail/mail-view.c:159 ui/evolution-mail.h:20
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "SporoХilo posreduj naprej"
 
-#: mail/mail-view.c:163 ui/evolution-addressbook.h:16
-#: ui/evolution-calendar.h:26 ui/evolution-mail.h:29
-msgid "Print"
-msgstr "Natisni"
-
-#: mail/mail-view.c:163 ui/evolution-mail.h:33
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Natisni izbrano sporoХilo"
 
-#: mail/mail-view.c:165 ui/evolution-mail.h:14
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Zbri╧i to sporХilo"
 
-#: mail/message-list.c:505
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:2043
+#: mail/message-list.c:575
+msgid "Seen"
+msgstr "Videno"
+
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr "Odgovorjeno"
+
+#: mail/message-list.c:846
+#, 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
+
+#: mail/message-list.c:860 mail/message-list.c:875
+#, fuzzy
+msgid "<unknown>"
+msgstr "Neznano"
+
+#: mail/message-list.c:2068
 msgid "Rebuilding message view"
 msgstr "Obnavljam pogled sporoХil"
 
-#: mail/message-list.c:2045
+#: mail/message-list.c:2070
 msgid "Rebuild message view"
 msgstr "Obnovi pogled sporoХil"
 
-#: mail/message-thread.c:582
-msgid "Threading message list"
-msgstr "Nitim seznam sporoХil"
-
-#: mail/message-thread.c:584
-msgid "Thread message list"
-msgstr "Niten seznam sporoХil"
-
 #: mail/subscribe-dialog.c:139
 msgid "Display folders starting with:"
 msgstr "Prika╬i mape, ki se zaХnejo z:"
@@ -5194,27 +5157,31 @@ msgstr "Dobivam shrambo za \"%s\""
 msgid "Get store for \"%s\""
 msgstr "Dobi shrambo za \"%s\""
 
-#: mail/subscribe-dialog.c:280
+#: mail/subscribe-dialog.c:282
+#, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "NaroХam se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:286
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "Preklicujem naroХnino na mapo \"%s\""
+
+#: mail/subscribe-dialog.c:290
+#, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "NaroХi se na mapo \"%s\""
 
-#: mail/subscribe-dialog.c:387
-msgid "Unsubscribing to folder \"%s\""
-msgstr "Preklicujem naroХnino na mapo \"%s\""
-
-#: mail/subscribe-dialog.c:390
-msgid "Unsubscribe to folder \"%s\""
+#: mail/subscribe-dialog.c:293
+#, fuzzy, c-format
+msgid "Unsubscribe from folder \"%s\""
 msgstr "PrekliХi naroХnono na mapo \"%s\""
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Namestitev Evolucije"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
@@ -5222,30 +5189,30 @@ msgstr ""
 "Ta razliХica Evolucije mora namestiti dodatne datoteke\n"
 "v va╧ osebni imenik Evolucije"
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 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:152
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr "Nisem mogel pravilno prenoviti datotek"
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Evolucijine datoteke so se uspe╧no namestile."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "Izgleda, da je tokrat va╧ prvi zagon Evolucije."
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:188
 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:197
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -5256,7 +5223,7 @@ msgstr ""
 "%s\n"
 "Napaka: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -5265,7 +5232,7 @@ msgstr ""
 "Ne morem kopirati datotek v\n"
 "`%s'."
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -5276,7 +5243,7 @@ msgstr ""
 "Prosim premestite jo, da se lahko namestitev\n"
 "Evolucijinih uporabni╧kih datotek nadaljuje."
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -5332,11 +5299,11 @@ msgstr "Program 'Bug buddy' ni bil najden v va╧i poti ($PATH)."
 msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoХe pognati."
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Avtorske pravice pridr╬ane 1999,2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5346,37 +5313,37 @@ msgstr ""
 "GNOME za delo v skupinah, za po╧to, koledar in \n"
 "urejanje stikov."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Pojdi v mapo..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "(Nobena mapa ni prikazana)"
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Mape"
 
-#: shell/e-shell-view.c:1021
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1167
+#: shell/e-shell.c:372
 #, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
+
+#: shell/e-shell.c:1208
+#, fuzzy, c-format
 msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
 "This probably means that the %s component has crashed."
 msgstr ""
 "Opa!  Pogled za `%s' je nepriХakovano umru.  :-(\n"
 "To verjetno pomeni, da se je sesula komponenta %s."
 
-#: shell/e-shell.c:336
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ne morem nastaviti krajevnega hranilnika -- %s"
-
 #: shell/e-shortcuts-view.c:122
 msgid "Create new shortcut group"
 msgstr "Ustvari novo skupino bli╬njic"
@@ -5446,64 +5413,65 @@ msgstr "Odstrani to bli╬njico iz vrstice bli╬njic"
 msgid "Error saving shortcuts."
 msgstr "Napaka ob shranjevanju bli╬njic."
 
-#: shell/e-storage.c:128
+#: 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
+msgid "_View"
+msgstr "_Pogled"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Poglej izbrane mape"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: shell/e-storage.c:327
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Brez napak"
 
-#: shell/e-storage.c:329
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "GeneriХna napaka"
 
-#: shell/e-storage.c:331
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Mapa z enakim imenom ╬e obstaja"
 
-#: shell/e-storage.c:333
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Izbran tip mape ni veljaven"
 
-#: shell/e-storage.c:335
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "V/I napaka"
 
-#: shell/e-storage.c:337
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Ni dovolj prostora za ustvaritev mape"
 
-#: shell/e-storage.c:339
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Izbrana mapa ni bila najdena"
 
-#: shell/e-storage.c:341
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "Funkcija ni implementirana v tem hranilniku"
 
-#: shell/e-storage.c:343
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: shell/e-storage.c:345
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Operacija ni podprta"
 
-#: shell/e-storage.c:347
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Izbran tip ni podprt v tem hranilniku"
 
-#: shell/e-storage-set-view.c:235 ui/evolution-event-editor.h:91
-#: ui/evolution.h:39
-msgid "_View"
-msgstr "_Pogled"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Poglej izbrane mape"
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -5543,7 +5511,7 @@ msgstr ""
 "Upamo, da boste u╬ivali sadove na╧ega trdega dela in nestrpno\n"
 "priХakujemo va╧e prispevke!\n"
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -5551,990 +5519,1151 @@ msgstr ""
 "Hvala!\n"
 "Skupina Evolution\n"
 
-#: shell/main.c:123
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Ne morem inicializirati lupine Evolution."
 
-#: shell/main.c:162
+#: shell/main.c:178
+#, fuzzy
+msgid "Disable."
+msgstr "IzkljuХeno"
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Ne morem inicializirati komponentnega sistema Bonobo."
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 msgid "N_ew Directory Server"
 msgstr "N_ov stre╬nik imenikov"
 
-#: ui/evolution-addressbook-ldap.h:10
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ui/evolution-addressbook.h:10
+#: po/tmp/evolution-addressbook.xml.h:7
 msgid "Create a new contact"
 msgstr "Ustvari nov stik"
 
-#: ui/evolution-addressbook.h:12
+#: po/tmp/evolution-addressbook.xml.h:9
 msgid "Delete a contact"
 msgstr "Zbri╧i stik"
 
-#: ui/evolution-addressbook.h:13 ui/evolution-event-editor.h:33
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
 msgid "Find"
 msgstr "Poi╧Хi"
 
-#: ui/evolution-addressbook.h:14
+#: po/tmp/evolution-addressbook.xml.h:11
 msgid "Find a contact"
 msgstr "Poi╧Хi stik"
 
-#: ui/evolution-addressbook.h:15 ui/evolution-calendar.h:21
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 msgid "New"
 msgstr "Nov"
 
-#: ui/evolution-addressbook.h:17
+#: po/tmp/evolution-addressbook.xml.h:14
 msgid "Print contacts"
 msgstr "Natisni stike"
 
-#: ui/evolution-addressbook.h:18
+#: po/tmp/evolution-addressbook.xml.h:15
 msgid "Stop"
 msgstr "Ustavi"
 
-#: ui/evolution-addressbook.h:19
+#: po/tmp/evolution-addressbook.xml.h:16
 msgid "Stop Loading"
 msgstr "Ustavi nalaganje"
 
-#: ui/evolution-addressbook.h:20
+#: po/tmp/evolution-addressbook.xml.h:17
 msgid "View All"
 msgstr "Glej vse"
 
-#: ui/evolution-addressbook.h:21
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr "Glej vse stike"
 
-#: ui/evolution-addressbook.h:22
-msgid "_New Contact"
-msgstr "_Nov stik"
-
-#: ui/evolution-addressbook.h:23
+#: po/tmp/evolution-addressbook.xml.h:19
 msgid "_Print Contacts..."
 msgstr "_Natisni stike..."
 
-#: ui/evolution-addressbook.h:24
+#: po/tmp/evolution-addressbook.xml.h:20
 msgid "_Search for contacts"
 msgstr "_I╧Хi po kontaktih"
 
-#: ui/evolution-addressbook.h:25 ui/evolution-event-editor.h:113
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
 msgid "_Tools"
 msgstr "_Orodja"
 
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.h:9
+#: po/tmp/evolution-calendar.xml.h:6
 msgid "5 Days"
 msgstr "5 dni"
 
-#: ui/evolution-calendar.h:10
+#: po/tmp/evolution-calendar.xml.h:7
 msgid "Alter preferences"
 msgstr "Alternativne nastavitve"
 
-#: ui/evolution-calendar.h:11
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Koledar"
+
+#: po/tmp/evolution-calendar.xml.h:9
 msgid "Calendar Preferences..."
 msgstr "Nastavitve koledarja..."
 
-#: ui/evolution-calendar.h:12
+#: po/tmp/evolution-calendar.xml.h:10
 msgid "Create a new appointment"
 msgstr "Ustvari nov zmenek"
 
-#: ui/evolution-calendar.h:13
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: ui/evolution-calendar.h:14
+#: po/tmp/evolution-calendar.xml.h:12
 msgid "Day"
 msgstr "Dan"
 
-#: ui/evolution-calendar.h:15
+#: po/tmp/evolution-calendar.xml.h:13
 msgid "Go back in time"
 msgstr "Pojdi po Хasu nazaj"
 
-#: ui/evolution-calendar.h:16
+#: po/tmp/evolution-calendar.xml.h:14
 msgid "Go forward in time"
 msgstr "Pojdi po Хasu naprej"
 
-#: ui/evolution-calendar.h:17
+#: po/tmp/evolution-calendar.xml.h:15
 msgid "Go to"
 msgstr "Pojdi na"
 
-#: ui/evolution-calendar.h:18
+#: po/tmp/evolution-calendar.xml.h:16
 msgid "Go to a specific date"
 msgstr "Pojdi na doloХen datum"
 
-#: ui/evolution-calendar.h:19
+#: po/tmp/evolution-calendar.xml.h:17
 msgid "Go to present time"
 msgstr "Pojdi na sedanjost"
 
-#: ui/evolution-calendar.h:20
+#: po/tmp/evolution-calendar.xml.h:18
 msgid "Month"
 msgstr "Mesec"
 
-#: ui/evolution-calendar.h:22
-msgid "New Ca_lendar"
-msgstr "Nov Ko_ledar"
-
-#: ui/evolution-calendar.h:23 ui/evolution-event-editor.h:45
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
 msgid "Next"
 msgstr "Naprej"
 
-#: ui/evolution-calendar.h:24
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "Odpri koledar"
 
-#: ui/evolution-calendar.h:25
+#: po/tmp/evolution-calendar.xml.h:22
 msgid "Prev"
 msgstr "Nazaj"
 
-#: ui/evolution-calendar.h:27
+#: po/tmp/evolution-calendar.xml.h:24
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ui/evolution-calendar.h:28
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Save calendar as something else"
 msgstr "Shrani koledar kot nekaj drugega"
 
-#: ui/evolution-calendar.h:29
+#: po/tmp/evolution-calendar.xml.h:26
 msgid "Show 1 day"
 msgstr "Ka╬i en dan"
 
-#: ui/evolution-calendar.h:30
+#: po/tmp/evolution-calendar.xml.h:27
 msgid "Show 1 month"
 msgstr "Ka╬i en mesec"
 
-#: ui/evolution-calendar.h:31
+#: po/tmp/evolution-calendar.xml.h:28
 msgid "Show 1 week"
 msgstr "Ka╬i en teden"
 
-#: ui/evolution-calendar.h:32
+#: po/tmp/evolution-calendar.xml.h:29
 msgid "Show the working week"
 msgstr "Poka╬i delavni teden"
 
-#: ui/evolution-calendar.h:33 widgets/misc/e-dateedit.c:365
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
 msgid "Today"
 msgstr "Danes"
 
-#: ui/evolution-calendar.h:34
+#: po/tmp/evolution-calendar.xml.h:31
 msgid "Week"
 msgstr "Teden"
 
-#: ui/evolution-calendar.h:35 ui/evolution.h:35
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
 msgid "_New"
 msgstr "_Nova"
 
-#: ui/evolution-calendar.h:36
-msgid "_New appointment..."
-msgstr "_Nov zmenek..."
-
-#: ui/evolution-calendar.h:37
-msgid "_Open"
-msgstr "_Odpri"
-
-#: ui/evolution-calendar.h:38
+#: po/tmp/evolution-calendar.xml.h:33
 msgid "_Open Calendar"
 msgstr "Odpri ko_ledar"
 
-#: ui/evolution-calendar.h:39
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "_Natisni ta koledar"
 
-#: ui/evolution-calendar.h:40
+#: po/tmp/evolution-calendar.xml.h:35
 msgid "_Save Calendar As"
 msgstr "_Shrani koledar kot"
 
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-event-editor.h:55
-#: ui/evolution-subscribe.h:19 ui/evolution.h:29
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ui/evolution-contact-editor.h:10 ui/evolution-event-editor.h:69
-msgid "_Save"
-msgstr "_Shrani"
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Zbri╧i ta predmet"
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "Shrani _kot"
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "Zbri╧i"
 
-#: ui/evolution-contact-editor.h:13 ui/evolution-event-editor.h:66
-msgid "_Print"
-msgstr "_Natisni"
+#: po/tmp/evolution-contact-editor.xml.h:9
+#, fuzzy
+msgid "Help"
+msgstr "_PomoХ"
 
-#: ui/evolution-contact-editor.h:15 ui/evolution-event-editor.h:11
-msgid "Save and Close"
-msgstr "Shrani in zapri"
+#: po/tmp/evolution-contact-editor.xml.h:10
+#, fuzzy
+msgid "Print En_velope..."
+msgstr "Nas_tavi tiskanje..."
 
-#: ui/evolution-contact-editor.h:16
-msgid "Save the contact and close the dialog box"
-msgstr "Shrani stik in zapri dialog"
+#: po/tmp/evolution-contact-editor.xml.h:11
+#: po/tmp/evolution-event-editor.xml.h:81
+msgid "Print this item"
+msgstr "Natisni ta predmet"
 
-#: ui/evolution-contact-editor.h:17 ui/evolution-event-editor.h:15
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/evolution-event-editor.xml.h:82
 msgid "Print..."
 msgstr "Natisni..."
 
-#: ui/evolution-contact-editor.h:18 ui/evolution-event-editor.h:16
-msgid "Print this item"
-msgstr "Natisni ta predmet"
+#: po/tmp/evolution-contact-editor.xml.h:13
+#: po/tmp/evolution-event-editor.xml.h:89
+#: po/tmp/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Shrani _kot..."
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "Zbri╧i ta predmet"
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr "Shrani in zapri"
 
-#: ui/evolution-event-editor.h:10
-msgid "Save the current file"
-msgstr "Shrani trenutno datoteko"
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
+msgstr "Shrani stik in zapri dialog"
 
-#: ui/evolution-event-editor.h:12
-msgid "Save the appointment and close the dialog box"
-msgstr "Shrani zmenek in zapri dialog"
+#: po/tmp/evolution-contact-editor.xml.h:16
+msgid "Se_nd contact to other..."
+msgstr ""
 
-#: ui/evolution-event-editor.h:17
-msgid "Print Setup"
-msgstr "Nastavitev tiskanja"
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
+msgid "See online help"
+msgstr "Glej pomoХ na liniji"
 
-#: ui/evolution-event-editor.h:18
-msgid "Setup the page settings for your current printer"
-msgstr "Nastavi lastnosti strani za va╧ trenutni tiskalnik"
+#: po/tmp/evolution-contact-editor.xml.h:18
+#, fuzzy
+msgid "Send _message to contact..."
+msgstr "FIXME: Novo sporoХilo za stik"
 
-#: ui/evolution-event-editor.h:20
-msgid "Close this appointment"
-msgstr "Zapri ta zmenek"
+#: 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
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ui/evolution-event-editor.h:21
-msgid "Cut"
-msgstr "Izre╬i"
+#: po/tmp/evolution-contact-editor.xml.h:20
+#, fuzzy
+msgid "_Print..."
+msgstr "Natisni..."
 
-#: ui/evolution-event-editor.h:22
-msgid "Cut the selection"
-msgstr "Izre╬i izbrano"
+#: po/tmp/evolution-contact-editor.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:121
+#: po/tmp/evolution-message-composer.xml.h:42
+msgid "_Save"
+msgstr "_Shrani"
 
-#: ui/evolution-event-editor.h:23 ui/evolution-mail.h:11
-msgid "Copy"
-msgstr "Kopiraj"
+#.
+#. * 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
+msgid "About this application"
+msgstr "O tem programu"
 
-#: ui/evolution-event-editor.h:24
-msgid "Copy the selection"
-msgstr "Kopiraj izbrano"
+#: po/tmp/evolution-event-editor.xml.h:7
+msgid "About..."
+msgstr "O..."
 
-#: ui/evolution-event-editor.h:25
-msgid "Paste"
-msgstr "Prilepi"
+#: po/tmp/evolution-event-editor.xml.h:8
+msgid "Actio_ns"
+msgstr "_Dejanja"
 
-#: ui/evolution-event-editor.h:26
-msgid "Paste the clipboard"
-msgstr "Prilepi odlo╬i╧Хe"
+#: po/tmp/evolution-event-editor.xml.h:9
+msgid "C_lear"
+msgstr "х_isti"
 
-#: ui/evolution-event-editor.h:27
+#: po/tmp/evolution-event-editor.xml.h:10
+msgid "C_ut"
+msgstr "_Izre╬i"
+
+#: po/tmp/evolution-event-editor.xml.h:11
 msgid "Clear"
 msgstr "PoХisti"
 
-#: ui/evolution-event-editor.h:28
+#: po/tmp/evolution-event-editor.xml.h:12
 msgid "Clear the selection"
 msgstr "PoХisti izbiro"
 
-#: ui/evolution-event-editor.h:29
-msgid "Undo"
-msgstr "Razveljavi"
+#: po/tmp/evolution-event-editor.xml.h:14
+msgid "Close this appointment"
+msgstr "Zapri ta zmenek"
 
-#: ui/evolution-event-editor.h:30
-msgid "Undo the last action"
-msgstr "Razveljavi zadnje dejanje"
+#: po/tmp/evolution-event-editor.xml.h:15 po/tmp/evolution-mail.xml.h:8
+msgid "Copy"
+msgstr "Kopiraj"
 
-#: ui/evolution-event-editor.h:31
-msgid "Redo"
-msgstr "Obnovi"
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr "Kopiraj izbrano"
 
-#: ui/evolution-event-editor.h:32
-msgid "Redo the undone action"
-msgstr "Obnovi razveljavljeno dejanje"
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "Izre╬i"
 
-#: ui/evolution-event-editor.h:34
-msgid "Search for a string"
-msgstr "I╧Хi niz"
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr "Izre╬i izbrano"
 
-#: ui/evolution-event-editor.h:35
-msgid "Find Again"
-msgstr "Poi╧Хi znova"
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr "Shrani kot XML"
 
-#: ui/evolution-event-editor.h:36
-msgid "Search again for the same string"
-msgstr "I╧Хi enak niz znova"
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr "Shranio Xml opis uporabni╧kega vmesnika"
 
-#: ui/evolution-event-editor.h:37
-msgid "Replace"
-msgstr "Zamenjaj"
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr "FIXME: A_dresar..."
 
-#: ui/evolution-event-editor.h:38
-msgid "Replace a string"
-msgstr "Zamenjaj niz"
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr "FIXME: Izberi izmed..."
 
-#: ui/evolution-event-editor.h:39
-msgid "Select All"
-msgstr "Izberi vse"
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
+msgstr "FIXME: Preve_ri imena"
 
-#: ui/evolution-event-editor.h:40
-msgid "Select everything"
-msgstr "Izberi vse"
+#: po/tmp/evolution-event-editor.xml.h:26
+msgid "FIXME: Cop_y to Folder..."
+msgstr "FIXME: Kopiraj v mapo..."
 
-#: ui/evolution-event-editor.h:41
-msgid "Properties"
-msgstr "Lastnosti"
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
+msgstr "FIXME: _Oblikuj obrazec..."
 
-#: ui/evolution-event-editor.h:42
-msgid "Modify the file's properties"
-msgstr "Spremeni lastnosti datoteke"
+#: po/tmp/evolution-event-editor.xml.h:28
+msgid "FIXME: Define Print _Styles"
+msgstr "FIXME: DoloХi _sloge tiskanja"
 
-#: ui/evolution-event-editor.h:43
-msgid "Previous"
-msgstr "Prej╧nji"
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
+msgstr "FIXME: Obli_kuj ta obrazec"
 
-#: ui/evolution-event-editor.h:44
-msgid "Go to the previous item"
-msgstr "Pojdi na prej╧nji predmet"
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "FIXME: P_rvi predmet v mapi"
 
-#: ui/evolution-event-editor.h:46
-msgid "Go to the next item"
-msgstr "Pojdi na naslednji predmet"
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
+msgstr "FIXME: _Posreduj naprej"
 
-#: ui/evolution-event-editor.h:47
-msgid "FIXME: Schedule Meeting"
-msgstr "FIXME: NaХrtuj sestanek"
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
+msgstr "FIXME: Posreduj naprej kot v_Koledar"
 
-#: ui/evolution-event-editor.h:48
-msgid "Schedule some sort of a meeting"
-msgstr "NaХrtuj nek tip sestanka"
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr "FIXME: PomoХ"
 
-#: ui/evolution-event-editor.h:49
-msgid "About..."
-msgstr "O..."
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr "FIXME: Do_konХana naloga"
 
-#: ui/evolution-event-editor.h:50
-msgid "About this application"
-msgstr "O tem programu"
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr "FIXME: Vstavi datoteko"
 
-#: ui/evolution-event-editor.h:51
-msgid "FIXME: Help"
-msgstr "FIXME: PomoХ"
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr "FIXME: Pr_edmet..."
 
-#: ui/evolution-event-editor.h:52
-msgid "See online help"
-msgstr "Glej pomoХ na liniji"
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr "FIXME: Prilepi po_sebno..."
 
-#: ui/evolution-event-editor.h:53
-msgid "Dump XML"
-msgstr "Shrani kot XML"
+#: po/tmp/evolution-event-editor.xml.h:38
+msgid "FIXME: Print Pre_view"
+msgstr "FIXME: Predogled tiskanja"
 
-#: ui/evolution-event-editor.h:54
-msgid "Dump the UI Xml description"
-msgstr "Shranio Xml opis uporabni╧kega vmesnika"
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
+msgstr "FIXME: O_bjavi obrazec kot..."
 
-#: ui/evolution-event-editor.h:56
-msgid "FIXME: _Mail Message"
-msgstr "FIXME: _Po╧lji sporoХilo"
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr "FIXME: Ob_javi obrazec..."
 
-#: ui/evolution-event-editor.h:57
-msgid "FIXME: _Contact"
-msgstr "FIXME: _Stik"
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr "FIXME: Ponovitve..."
 
-#: ui/evolution-event-editor.h:58
-msgid "FIXME: _Task"
-msgstr "FIXME: _Naloga"
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr "FIXME: Po╧lji"
 
-#: ui/evolution-event-editor.h:59
+#: po/tmp/evolution-event-editor.xml.h:43
+msgid "FIXME: Save Attac_hments..."
+msgstr "FIXME: Dodaj prilogo..."
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr "FIXME: Razhro╧Хevalnik skript"
+
+#: po/tmp/evolution-event-editor.xml.h:45
 msgid "FIXME: Task _Request"
 msgstr "FIXME: Zahteva po _nalogi"
 
-#: ui/evolution-event-editor.h:60
-msgid "FIXME: _Journal Entry"
-msgstr "FIXME: _Vpis v dnevniku"
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr "FIXME: _Stik"
 
-#: ui/evolution-event-editor.h:61
-msgid "FIXME: _Note"
-msgstr "FIXME: _Opomba"
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr "FIXME: _Po meri..."
 
-#: ui/evolution-event-editor.h:62 ui/evolution-event-editor.h:118
-msgid "FIXME: Ch_oose Form..."
-msgstr "FIXME: Izberi izmed..."
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr "FIXME: _Datoteka..."
 
-#: ui/evolution-event-editor.h:63
-msgid "FIXME: _Memo Style"
-msgstr "FIXME: V slogu zabele╬ka"
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr "FIXME: _Pisava..."
 
-#: ui/evolution-event-editor.h:64
-msgid "FIXME: Define Print _Styles"
-msgstr "FIXME: DoloХi _sloge tiskanja"
+#: po/tmp/evolution-event-editor.xml.h:50
+msgid "FIXME: _Formatting"
+msgstr "FIXME: _Oblikovanje"
 
-#: ui/evolution-event-editor.h:65
-msgid "FIXME: Print Pre_view"
-msgstr "FIXME: Predogled tiskanja"
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr "FIXME: _Predmet"
 
-#: ui/evolution-event-editor.h:67
-msgid "Print S_etup..."
-msgstr "Nas_tavi tiskanje..."
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr "FIXME: _Vpis v dnevniku"
 
-#: ui/evolution-event-editor.h:68
-msgid "FIXME: S_end"
-msgstr "FIXME: Po╧lji"
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr "FIXME: _Zadnji predmet v mapi"
 
-#: ui/evolution-event-editor.h:70
-msgid "Save _As..."
-msgstr "Shrani _kot..."
+#: po/tmp/evolution-event-editor.xml.h:54
+msgid "FIXME: _Mail Message"
+msgstr "FIXME: _Po╧lji sporoХilo"
 
-#: ui/evolution-event-editor.h:71
-msgid "FIXME: Save Attac_hments..."
-msgstr "FIXME: Dodaj prilogo..."
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr "FIXME: V slogu zabele╬ka"
 
-#: ui/evolution-event-editor.h:73
+#: po/tmp/evolution-event-editor.xml.h:56
 msgid "FIXME: _Move to Folder..."
 msgstr "FIXME: Prestavi v mapo..."
 
-#: ui/evolution-event-editor.h:74
-msgid "FIXME: Cop_y to Folder..."
-msgstr "FIXME: Kopiraj v mapo..."
-
-#: ui/evolution-event-editor.h:75
-msgid "_Properties..."
-msgstr "_Lastnosti..."
+#: po/tmp/evolution-event-editor.xml.h:57
+msgid "FIXME: _New Appointment"
+msgstr "FIXME: _Nov zmenek"
 
-#: ui/evolution-event-editor.h:76
-msgid "_Close"
-msgstr "_Zapri"
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr "FIXME: _Opomba"
 
-#: ui/evolution-event-editor.h:77 ui/evolution-subscribe.h:18
-#: ui/evolution.h:28
-msgid "_Edit"
-msgstr "_Uredi"
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr "FIXME: _Zadeva..."
 
-#: ui/evolution-event-editor.h:78
-msgid "_Undo"
-msgstr "_Razveljavi"
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr "FIXME: _Odstavek..."
 
-#: ui/evolution-event-editor.h:79
-msgid "_Redo"
-msgstr "Obnovi"
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr "FIXME: _хrkovanje..."
 
-#: ui/evolution-event-editor.h:80
-msgid "C_ut"
-msgstr "_Izre╬i"
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr "FIXME: _ObiХajno"
 
-#: ui/evolution-event-editor.h:81
-msgid "_Copy"
-msgstr "_Kopiraj"
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr "FIXME: _Naloga"
 
-#: ui/evolution-event-editor.h:82
-msgid "_Paste"
-msgstr "_Prilepi"
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr "FIXME: _Neprebran predmet"
 
-#: ui/evolution-event-editor.h:83
-msgid "FIXME: Paste _Special... "
-msgstr "FIXME: Prilepi po_sebno..."
+#: po/tmp/evolution-event-editor.xml.h:65
+msgid "FIXME: what goes here?"
+msgstr "FIXME: kaj pride sem?"
 
-#: ui/evolution-event-editor.h:84 ui/evolution-event-editor.h:85
-msgid "C_lear"
-msgstr "х_isti"
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
+msgid "F_ormat"
+msgstr "O_blikuj izpis"
 
-#: ui/evolution-event-editor.h:86
-msgid "_Find..."
-msgstr "_Poi╧Хi"
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr "Poi╧Хi znova"
 
-#: ui/evolution-event-editor.h:87
+#: po/tmp/evolution-event-editor.xml.h:69
 msgid "Find _Again"
 msgstr "Poi╧Хi znova"
 
-#: ui/evolution-event-editor.h:88
-msgid "_Replace..."
-msgstr "_Zamenjaj..."
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr "Pojdi na naslednji predmet"
 
-#: ui/evolution-event-editor.h:89
-msgid "_Object"
-msgstr "_Predmet"
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr "Pojdi na prej╧nji predmet"
 
-#: ui/evolution-event-editor.h:90
-msgid "FIXME: what goes here?"
-msgstr "FIXME: kaj pride sem?"
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr "Spremeni lastnosti datoteke"
+
+#: po/tmp/evolution-event-editor.xml.h:73
+msgid "N_ext"
+msgstr "Napr_ej"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "Prilepi"
 
-#: ui/evolution-event-editor.h:92
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr "Prilepi odlo╬i╧Хe"
+
+#: po/tmp/evolution-event-editor.xml.h:77
 msgid "Pre_vious"
 msgstr "P_rej╧nji"
 
-#: ui/evolution-event-editor.h:93 ui/evolution-event-editor.h:98
-msgid "FIXME: _Item"
-msgstr "FIXME: _Predmet"
+#: po/tmp/evolution-event-editor.xml.h:78
+msgid "Previous"
+msgstr "Prej╧nji"
 
-#: ui/evolution-event-editor.h:94 ui/evolution-event-editor.h:99
-msgid "FIXME: _Unread Item"
-msgstr "FIXME: _Neprebran predmet"
+#: po/tmp/evolution-event-editor.xml.h:79
+msgid "Print S_etup..."
+msgstr "Nas_tavi tiskanje..."
 
-#: ui/evolution-event-editor.h:95 ui/evolution-event-editor.h:100
-msgid "FIXME: In_complete Task"
-msgstr "FIXME: Do_konХana naloga"
+#: po/tmp/evolution-event-editor.xml.h:80
+msgid "Print Setup"
+msgstr "Nastavitev tiskanja"
 
-#: ui/evolution-event-editor.h:96
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "FIXME: P_rvi predmet v mapi"
+#: po/tmp/evolution-event-editor.xml.h:83
+msgid "Properties"
+msgstr "Lastnosti"
 
-#: ui/evolution-event-editor.h:97
-msgid "N_ext"
-msgstr "Napr_ej"
+#: po/tmp/evolution-event-editor.xml.h:84
+msgid "Redo"
+msgstr "Obnovi"
 
-#: ui/evolution-event-editor.h:101
-msgid "FIXME: _Last Item in Folder"
-msgstr "FIXME: _Zadnji predmet v mapi"
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr "Obnovi razveljavljeno dejanje"
 
-#: ui/evolution-event-editor.h:102
-msgid "_Toolbars"
-msgstr "_Orodjarne"
+#: po/tmp/evolution-event-editor.xml.h:86
+msgid "Replace"
+msgstr "Zamenjaj"
 
-#: ui/evolution-event-editor.h:103
-msgid "FIXME: _Standard"
-msgstr "FIXME: _ObiХajno"
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr "Zamenjaj niz"
 
-#: ui/evolution-event-editor.h:104
-msgid "FIXME: _Formatting"
-msgstr "FIXME: _Oblikovanje"
+#: po/tmp/evolution-event-editor.xml.h:91
+msgid "Save the appointment and close the dialog box"
+msgstr "Shrani zmenek in zapri dialog"
 
-#: ui/evolution-event-editor.h:105
-msgid "FIXME: _Customize..."
-msgstr "FIXME: _Po meri..."
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
+msgid "Save the current file"
+msgstr "Shrani trenutno datoteko"
 
-#: ui/evolution-event-editor.h:106
-msgid "_Insert"
-msgstr "Vstavi"
+#: po/tmp/evolution-event-editor.xml.h:93
+#, fuzzy
+msgid "Schedule Meeting"
+msgstr "FIXME: NaХrtuj sestanek"
 
-#: ui/evolution-event-editor.h:107
-msgid "FIXME: _File..."
-msgstr "FIXME: _Datoteka..."
+#: po/tmp/evolution-event-editor.xml.h:94
+#, fuzzy
+msgid "Schedule _Meeting"
+msgstr "FIXME: _NaХrtuj sestanek"
 
-#: ui/evolution-event-editor.h:108
-msgid "FIXME: It_em..."
-msgstr "FIXME: Pr_edmet..."
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr "NaХrtuj nek tip sestanka"
 
-#: ui/evolution-event-editor.h:109
-msgid "FIXME: _Object..."
-msgstr "FIXME: _Zadeva..."
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr "I╧Хi enak niz znova"
 
-#: ui/evolution-event-editor.h:110
-msgid "F_ormat"
-msgstr "O_blikuj izpis"
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr "I╧Хi niz"
 
-#: ui/evolution-event-editor.h:111
-msgid "FIXME: _Font..."
-msgstr "FIXME: _Pisava..."
+#: po/tmp/evolution-event-editor.xml.h:99
+msgid "Select All"
+msgstr "Izberi vse"
 
-#: ui/evolution-event-editor.h:112
-msgid "FIXME: _Paragraph..."
-msgstr "FIXME: _Odstavek..."
+#: po/tmp/evolution-event-editor.xml.h:100
+msgid "Select everything"
+msgstr "Izberi vse"
 
-#: ui/evolution-event-editor.h:114
-msgid "FIXME: _Spelling..."
-msgstr "FIXME: _хrkovanje..."
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr "Nastavi lastnosti strani za va╧ trenutni tiskalnik"
 
-#: ui/evolution-event-editor.h:115
-msgid "FIXME: Chec_k Names"
-msgstr "FIXME: Preve_ri imena"
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr "Razveljavi"
 
-#: ui/evolution-event-editor.h:116
-msgid "FIXME: Address _Book..."
-msgstr "FIXME: A_dresar..."
+#: po/tmp/evolution-event-editor.xml.h:103
+msgid "Undo the last action"
+msgstr "Razveljavi zadnje dejanje"
 
-#: ui/evolution-event-editor.h:117
-msgid "_Forms"
-msgstr "_Obrazci"
+#: po/tmp/evolution-event-editor.xml.h:104
+#: po/tmp/evolution-message-composer.xml.h:34
+msgid "_About..."
+msgstr "_O..."
 
-#: ui/evolution-event-editor.h:119
-msgid "FIXME: Desi_gn This Form"
-msgstr "FIXME: Obli_kuj ta obrazec"
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+msgid "_Close"
+msgstr "_Zapri"
 
-#: ui/evolution-event-editor.h:120
-msgid "FIXME: D_esign a Form..."
-msgstr "FIXME: _Oblikuj obrazec..."
+#: po/tmp/evolution-event-editor.xml.h:106
+msgid "_Copy"
+msgstr "_Kopiraj"
 
-#: ui/evolution-event-editor.h:121
-msgid "FIXME: Publish _Form..."
-msgstr "FIXME: Ob_javi obrazec..."
+#: po/tmp/evolution-event-editor.xml.h:107
+#: po/tmp/evolution-message-composer.xml.h:36
+msgid "_Debug"
+msgstr "_Razhro╧Хuj"
 
-#: ui/evolution-event-editor.h:122
-msgid "FIXME: Pu_blish Form As..."
-msgstr "FIXME: O_bjavi obrazec kot..."
+#: 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
+msgid "_Edit"
+msgstr "_Uredi"
 
-#: ui/evolution-event-editor.h:123
-msgid "FIXME: Script _Debugger"
-msgstr "FIXME: Razhro╧Хevalnik skript"
+#: po/tmp/evolution-event-editor.xml.h:111
+msgid "_Find..."
+msgstr "_Poi╧Хi"
 
-#: ui/evolution-event-editor.h:124
-msgid "Actio_ns"
-msgstr "_Dejanja"
+#: po/tmp/evolution-event-editor.xml.h:112
+msgid "_Forms"
+msgstr "_Obrazci"
 
-#: ui/evolution-event-editor.h:125
-msgid "FIXME: _New Appointment"
-msgstr "FIXME: _Nov zmenek"
+#: po/tmp/evolution-event-editor.xml.h:113
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+msgid "_Help"
+msgstr "_PomoХ"
 
-#: ui/evolution-event-editor.h:126
-msgid "FIXME: Rec_urrence..."
-msgstr "FIXME: Ponovitve..."
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr "Vstavi"
 
-#: ui/evolution-event-editor.h:127
-msgid "FIXME: Schedule _Meeting"
-msgstr "FIXME: _NaХrtuj sestanek"
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr "_Predmet"
 
-#: ui/evolution-event-editor.h:128
-msgid "FIXME: Forward as v_Calendar"
-msgstr "FIXME: Posreduj naprej kot v_Koledar"
+#: po/tmp/evolution-event-editor.xml.h:116
+msgid "_Paste"
+msgstr "_Prilepi"
 
-#: ui/evolution-event-editor.h:129
-msgid "FIXME: For_ward"
-msgstr "FIXME: _Posreduj naprej"
+#: po/tmp/evolution-event-editor.xml.h:117
+msgid "_Print"
+msgstr "_Natisni"
 
-#: ui/evolution-event-editor.h:130 ui/evolution.h:32
-msgid "_Help"
-msgstr "_PomoХ"
+#: po/tmp/evolution-event-editor.xml.h:118
+msgid "_Properties..."
+msgstr "_Lastnosti..."
 
-#: ui/evolution-event-editor.h:131
-msgid "_About..."
-msgstr "_O..."
+#: po/tmp/evolution-event-editor.xml.h:119
+msgid "_Redo"
+msgstr "Obnovi"
 
-#: ui/evolution-event-editor.h:132
-msgid "_Debug"
-msgstr "_Razhro╧Хuj"
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr "_Zamenjaj..."
 
-#: ui/evolution-event-editor.h:133
-msgid "FIXME: Insert File"
-msgstr "FIXME: Vstavi datoteko"
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
+msgstr "_Orodjarne"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
+msgstr "_Razveljavi"
 
 #.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-mail.h:9
+#: po/tmp/evolution-mail.xml.h:6
 msgid "Compose"
 msgstr "Sestavi"
 
-#: ui/evolution-mail.h:10
+#: po/tmp/evolution-mail.xml.h:7
 msgid "Compose a new message"
 msgstr "Sestavi novo sporoХilo"
 
-#: ui/evolution-mail.h:12
+#: po/tmp/evolution-mail.xml.h:9
 msgid "Copy message to a new folder"
 msgstr "Prestavi sporoХilo v novo mapo"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:11
+#: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "_Mapa"
 
-#: ui/evolution-mail.h:16
+#: po/tmp/evolution-mail.xml.h:14
 msgid "Fi_lter on Sender"
 msgstr "Filtriraj glede na Po╧iljatelja"
 
-#: ui/evolution-mail.h:17
+#: po/tmp/evolution-mail.xml.h:15
 msgid "Filter on Rec_ipients"
 msgstr "Filtriraj glede na Prejemnike"
 
-#: ui/evolution-mail.h:18
+#: po/tmp/evolution-mail.xml.h:16
 msgid "Forget _Passwords"
 msgstr "Pozabi _gesla"
 
-#: ui/evolution-mail.h:21
+#: po/tmp/evolution-mail.xml.h:20
 msgid "Get Mail"
 msgstr "Poberi po╧to"
 
-#: ui/evolution-mail.h:22
-msgid "Mail _Filters..."
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
 msgstr "Po╧lji _filtre ..."
 
-#: ui/evolution-mail.h:23
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
 msgstr "Uredi naroХnine..."
 
-#: ui/evolution-mail.h:24
+#: po/tmp/evolution-mail.xml.h:23
 msgid "Mar_k As Read"
 msgstr "OznaХi _kot prebrano"
 
-#: ui/evolution-mail.h:25
+#: po/tmp/evolution-mail.xml.h:24
 msgid "Mark As U_nread"
 msgstr "OznaХi kot _neprebrano"
 
-#: ui/evolution-mail.h:26
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Prestavi"
 
-#: ui/evolution-mail.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Prestavi sporoХilo v novo mapo"
 
-#: ui/evolution-mail.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Previews the message to be printed"
 msgstr "Predogled sporoХika, ki bo natisnjeno"
 
-#: ui/evolution-mail.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Print Preview of message..."
 msgstr "Predogled tiskanja sporoХila"
 
-#: ui/evolution-mail.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Print message to the printer"
 msgstr "Natisni sporoХilo na tiskalniku"
 
-#: ui/evolution-mail.h:32
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print message..."
 msgstr "Natisni sporoХilo..."
 
-#: ui/evolution-mail.h:36
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: ui/evolution-mail.h:37
+#: po/tmp/evolution-mail.xml.h:36
 msgid "Reply to _Sender"
 msgstr "Odgovori po╧iljatelju"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:15
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Izberi vse"
 
-#: ui/evolution-mail.h:41
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Send queued mail and retrieve new mail"
 msgstr "Po╧lji po╧to v vrsti in sprejmi novo po╧to"
 
-#: ui/evolution-mail.h:42
+#: po/tmp/evolution-mail.xml.h:41
 msgid "Threaded Message list"
 msgstr "_Niten seznam sporoХil"
 
-#: ui/evolution-mail.h:43
+#: po/tmp/evolution-mail.xml.h:42
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _Po╧iljatelja"
 
-#: ui/evolution-mail.h:44
+#: po/tmp/evolution-mail.xml.h:43
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na _Sprejemnike"
 
-#: ui/evolution-mail.h:45
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
 msgid "_Apply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ui/evolution-mail.h:46
+#: po/tmp/evolution-mail.xml.h:46
 msgid "_Configure Folder"
 msgstr "_Nastavi mapo"
 
-#: ui/evolution-mail.h:47
-msgid "_Copy to Folder"
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo"
 
-#: ui/evolution-mail.h:49
+#: po/tmp/evolution-mail.xml.h:49
 msgid "_Edit Message"
 msgstr "_Uredi sporoХilo"
 
-#: ui/evolution-mail.h:50
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Expunge"
 msgstr "_UniХi"
 
-#: ui/evolution-mail.h:51
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Filter on Subject"
 msgstr "Filtriraj glede na _Zadevo"
 
-#: ui/evolution-mail.h:52
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Forward"
 msgstr "Posreduj _naprej"
 
-#: ui/evolution-mail.h:53 ui/evolution-subscribe.h:20
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Obrni izbor"
 
-#: ui/evolution-mail.h:54
-msgid "_Mail Configuration..."
-msgstr "Nastavitev _Po╧te..."
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "Nastavitev _po╧te"
 
-#: ui/evolution-mail.h:55
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Message"
 msgstr "_SporoХilo"
 
-#: ui/evolution-mail.h:56
-msgid "_Move to Folder"
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
 msgstr "_Prestavi v mapo"
 
-#: ui/evolution-mail.h:57
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Open in New Window"
 msgstr "_Odpri v novem oknu"
 
-#: ui/evolution-mail.h:58
+#: po/tmp/evolution-mail.xml.h:58
 msgid "_Print Message"
 msgstr "_Natisni sporoХilo"
 
-#: ui/evolution-mail.h:59
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Shrani kot..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Vir"
+
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Threaded"
 msgstr "_Niteno"
 
-#: ui/evolution-mail.h:60
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Zbri╧i"
+
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_VFolder on Subject"
 msgstr "vMapa glede na _Zadevo"
 
-#: ui/evolution-mail.h:61
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
 msgstr "Urejevalnik _virtualnih map..."
 
 #.
-#. *  This file is autogenerated from evolution-subscribe.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-subscribe.h:9
+#: po/tmp/evolution-message-composer.xml.h:6
+msgid "Attach"
+msgstr "Prilo╬i"
+
+#: po/tmp/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "Close the current file"
+msgstr "Shrani trenutno datoteko"
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr "HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:12
+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
+#, fuzzy
+msgid "Insert text file..."
+msgstr "_Vstavi datoteko z besedilom... (FIXME)"
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "Odpri datoteko"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "Shrani _kot"
+
+#: po/tmp/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "Shrani v _mapo..."
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Shrani v _mapo..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+#, fuzzy
+msgid "Save the current file with a different name"
+msgstr "Shrani trenutno datoteko"
+
+#: po/tmp/evolution-message-composer.xml.h:23
+msgid "Save the message in a specified folder"
+msgstr "Shrani sporoХilo v izbrano mapo"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send"
+msgstr "Po╧iljatelj"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "Po╧iljatelj"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "Po╧iljatelj"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send the mail in HTML format"
+msgstr "Po╧lji po╧to v HTML obliki"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Po╧lji to sporoХilo"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "Po╧lji to sporoХilo"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Po╧lji to sporoХilo"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Ka╬i/skrij priloge"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+msgid "Show _attachments"
+msgstr "Ka╬i priloge"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "Ka╬i priloge"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr "_Vstavi datoteko z besedilom... (FIXME)"
+
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "Odpri..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
 msgid "Add folder to your list of subscribed folders"
 msgstr "Dodaj mapo na seznam naroХenih map"
 
-#: ui/evolution-subscribe.h:12
+#: po/tmp/evolution-subscribe.xml.h:9
 msgid "Refresh List"
 msgstr "Osve╬i seznam"
 
-#: ui/evolution-subscribe.h:13
+#: po/tmp/evolution-subscribe.xml.h:10
 msgid "Refresh List of Folders"
 msgstr "Osve╬i seznam map"
 
-#: ui/evolution-subscribe.h:14
+#: po/tmp/evolution-subscribe.xml.h:11
 msgid "Remove folder from your list of subscribed folders"
 msgstr "Odstrani mapo iz seznama naroХenih map"
 
-#: ui/evolution-subscribe.h:16
+#: po/tmp/evolution-subscribe.xml.h:13
 msgid "Subscribe"
 msgstr "NaroХi"
 
-#: ui/evolution-subscribe.h:17
+#: po/tmp/evolution-subscribe.xml.h:14
 msgid "Unsubscribe"
 msgstr "Prekini naroХnino"
 
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.h:9
-msgid "Create a new folder"
-msgstr "Ustvari novo mapo"
-
-#: ui/evolution.h:10
+#: po/tmp/evolution.xml.h:6
 msgid "Display a different folder"
 msgstr "Poka╬i drugo mapo"
 
-#: ui/evolution.h:11
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "_Izhod"
 
-#: ui/evolution.h:12
+#: po/tmp/evolution.xml.h:8
 msgid "Evolution bar _shortcut"
 msgstr "Evolution vrstica z bli╬njicami"
 
-#: ui/evolution.h:13
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ui/evolution.h:14
+#: po/tmp/evolution.xml.h:10
 msgid "Getting _Started"
 msgstr "Kako _zaХeti"
 
-#: ui/evolution.h:15
+#: po/tmp/evolution.xml.h:11
 msgid "Show information about Evolution"
 msgstr "Ka╬i podatke o Evoluciji"
 
-#: ui/evolution.h:16
+#: po/tmp/evolution.xml.h:12
 msgid "Show the _Folder Bar"
 msgstr "Ka╬i vrstico z _mapami"
 
-#: ui/evolution.h:17
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Shortcut Bar"
 msgstr "Ka╬i vrstico z bli╬njicami"
 
-#: ui/evolution.h:18
-msgid "Submit bug report using Bug Buddy"
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "_Po╧lji poroХilo o hro╧Хu"
+
+#: po/tmp/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"
 
-#: ui/evolution.h:19
+#: po/tmp/evolution.xml.h:16
 msgid "Toggle whether to show the folder bar"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: ui/evolution.h:20
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Preklopi prikaz vrstice z bli╬njicami"
 
-#: ui/evolution.h:21
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr "Uporaba upravljalnika _stikov"
 
-#: ui/evolution.h:22
+#: po/tmp/evolution.xml.h:19
 msgid "Using the _Calendar"
 msgstr "Uporaba _koledarja"
 
-#: ui/evolution.h:23
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Mailer"
 msgstr "Uporaba _po╧te"
 
-#: ui/evolution.h:24
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "_O Evoluciji..."
 
-#: ui/evolution.h:25
+#: po/tmp/evolution.xml.h:22
 msgid "_Appointment (FIXME)"
 msgstr "_Zmenek (FIXME)"
 
-#: ui/evolution.h:26
+#: po/tmp/evolution.xml.h:23
 msgid "_Contact (FIXME)"
 msgstr "_Kontakt (FIXME)"
 
-#: ui/evolution.h:27
-msgid "_Create New Folder..."
-msgstr "_Ustvari novo mapo..."
-
-#: ui/evolution.h:30
+#: po/tmp/evolution.xml.h:26
 msgid "_Folder"
 msgstr "_Mapa"
 
-#: ui/evolution.h:31
+#: po/tmp/evolution.xml.h:27
 msgid "_Go to Folder..."
 msgstr "Pojdi v _mapo..."
 
-#: ui/evolution.h:33
+#: po/tmp/evolution.xml.h:29
 msgid "_Index"
 msgstr "_Kazalo"
 
-#: ui/evolution.h:34
+#: po/tmp/evolution.xml.h:30
 msgid "_Mail message (FIXME)"
 msgstr "_Po╧lji sporoХilo (FIXME)"
 
-#: ui/evolution.h:36
+#: po/tmp/evolution.xml.h:32
 msgid "_Settings"
 msgstr "_Nastavitve"
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "_Po╧lji poroХilo o hro╧Хu"
-
-#: ui/evolution.h:38
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "Poskusno"
@@ -6611,13 +6740,6 @@ msgstr "хas zakljuХka sestanka:"
 msgid "All Attendees"
 msgstr "Vsi udele╬eni"
 
-#. 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:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6627,29 +6749,285 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+msgid "Now"
+msgstr "Sedaj"
+
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:234 widgets/misc/e-dateedit.c:673
-#: widgets/misc/e-dateedit.c:766 widgets/misc/e-dateedit.c:811
-#: widgets/misc/e-dateedit.c:1127
+#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
+#: widgets/misc/e-dateedit.c:1487
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:237 widgets/misc/e-dateedit.c:676
-#: widgets/misc/e-dateedit.c:769 widgets/misc/e-dateedit.c:814
-#: widgets/misc/e-dateedit.c:1130
+#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
+#: widgets/misc/e-dateedit.c:1490
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
-#: widgets/misc/e-dateedit.c:359
-msgid "Now"
-msgstr "Sedaj"
-
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Skupina %i"
 
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Ste prepriХani, da \n"
+#~ "╬elite izbrisati ta stik?"
+
+#~ msgid "window2"
+#~ msgstr "okno2"
+
+#~ msgid "Recur on the"
+#~ msgstr "Ponovitev na"
+
+#~ msgid "th day of the month"
+#~ msgstr "dan v mesecu"
+
+#~ msgid ""
+#~ "This appointment has custom recurrence rules that cannot be edited by "
+#~ "Evolution.\n"
+#~ "\n"
+#~ "However, the appointment will recur at the appropriate time and will be "
+#~ "displayed properly in the calendar views."
+#~ msgstr ""
+#~ "Ta zmenek ima pravila ponovitev po meri, ki ne morejo biti urejana znotraj "
+#~ "Evolucije.\n"
+#~ "\n"
+#~ "Vendar se bo zmenek ponovil pravoХasno in bo  pravilno prikazan v pogledu "
+#~ "koledarja."
+
+#~ msgid "Create to-do item"
+#~ msgstr "Ustvari predmet za-opravit"
+
+#~ msgid "Edit to-do item"
+#~ msgstr "Uredi predemet za-opravit"
+
+#~ msgid "Summary:"
+#~ msgstr "Povzetek:"
+
+#~ msgid "Due Date:"
+#~ msgstr "Do datuma:"
+
+#~ msgid "Priority:"
+#~ msgstr "Prioriteta:"
+
+#~ msgid "Item Comments:"
+#~ msgstr "Komentarji predmeta:"
+
+#~ msgid "Time display"
+#~ msgstr "Prikaz Хasa"
+
+#~ msgid "Time format"
+#~ msgstr "Oblika izpisa Хasa"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12 urna (dop./pop.)"
+
+#~ msgid "24-hour"
+#~ msgstr "24 urna"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Tedni se zaХnejo v"
+
+#~ msgid "Day range"
+#~ msgstr "Razpon dni"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "Prosim izberite ure zaХetka in konca dneva, ki naj\n"
+#~ "bodo prikazane v dnevnem in tedenskem pogledu.\n"
+#~ "хasi izven tega razpona ne bodo samodejno prikazani"
+
+#~ msgid "Day start:"
+#~ msgstr "ZaХetek dneva:"
+
+#~ msgid "Day end:"
+#~ msgstr "Konec dneva:"
+
+#~ msgid "Colors for display"
+#~ msgstr "Barve za prikaz"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "Poka╬i v seznamu za-opravit:"
+
+#~ msgid "To Do List style options:"
+#~ msgstr "Slog seznama za-opravit:"
+
+#~ msgid "Highlight overdue items"
+#~ msgstr "Osvetli preteХene predmete"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "Osvetli ╧e nepreteХene predmete"
+
+#~ msgid "Highlight items due today"
+#~ msgstr "Osvetli predmete z dana╧njim rokom"
+
+#~ msgid "To Do List Properties"
+#~ msgstr "Lastnosti seznama Za-opravit"
+
+#~ msgid "To Do List"
+#~ msgstr "Seznam Za-opravit"
+
+#~ msgid "Preferences"
+#~ msgstr "Nastavitve"
+
+#~ msgid "Alarms"
+#~ msgstr "Alarmi"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "Lastnosti alarma"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "Piskaj ob zaslonskih alarmih"
+
+#~ msgid "Audio alarms timeout after"
+#~ msgstr "ZvoХni alarmi preteХejo po"
+
+#~ msgid " seconds"
+#~ msgstr " sekundah"
+
+#~ msgid "Enable snoozing for "
+#~ msgstr "OmogoХi podalj╧anje spanja za "
+
+#~ msgid "Could not create summary"
+#~ msgstr "Nisem mogel ustvariti povzetka"
+
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Ne morem dobiti sporoХila: %s"
+
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "Za branje po╧te dostavljene na krajevni sistem in za shranjevanje po╧te na "
+#~ "krajevni disk."
+
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Nisem mogel preimenovati mape %s v %s: cilj ╬e obstaja"
+
+#~ msgid "Could not open summary %s"
+#~ msgstr "Nisem mogel odpreti povzetka %s"
+
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Povzetek se ne ujema, X-Evolution glava manjka"
+
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Ne morem kopirati podatkov v izhodno datoteko: %s"
+
+#~ msgid "Could not load or create summary"
+#~ msgstr "Nisem mogel nalo╬iti ali ustvariti povzetka"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Nisem mogel preimenovati mape `%s': %s ╬e obstaja"
+
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH mape ne morejo biti gnezdene"
+
+#~ msgid "Deleted"
+#~ msgstr "Zbrisano"
+
+#~ msgid "Draft"
+#~ msgstr "Osnutek"
+
+#~ msgid "Flagged"
+#~ msgstr "OznaХeno"
+
+#~ msgid "Set Flag"
+#~ msgstr "Postavi oznaХbo"
+
+#~ msgid "does not match regex"
+#~ msgstr "ne ustreza z regularnemu izrazu"
+
+#~ 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."
+
+#~ msgid "Custom search"
+#~ msgstr "Iskanje po meri"
+
+#~ msgid "Custom"
+#~ msgstr "Po meri"
+
+#~ 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"
+
+#~ msgid "Copy Message"
+#~ msgstr "Kopiraj sporoХilo"
+
+#~ msgid "Full Search"
+#~ msgstr "Polno iskanje"
+
+#~ msgid ""
+#~ "Welcome to the Evolution Mail configuration wizard!\n"
+#~ "By filling in some information about your email\n"
+#~ "settings, you can start sending and receiving email\n"
+#~ "right away. Click Next to continue."
+#~ msgstr ""
+#~ "Dobrodo╧li v nastavitvenem Хarovniku po╧te!\n"
+#~ "Z vpisom nekaterih podatkov o va╧ih nastavitvah e-po╧te\n"
+#~ "lahko takoj priХnete po╧iljati in sprejemati po╧to\n"
+#~ "Kliknite naprej za nadaljevanje."
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Nisem mogel ustvariti cevi do %s: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Nisem mogel izvr╧iti %s: %s\n"
+
+#~ 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'"
+
+#~ msgid "Threading message list"
+#~ msgstr "Nitim seznam sporoХil"
+
+#~ 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..."
+
 #~ msgid "Quick Search"
 #~ msgstr "Hitro iskanje"
 
@@ -6677,9 +7055,6 @@ msgstr "Skupina %i"
 #~ msgid "FIXME: New _Letter to Contact"
 #~ msgstr "FIXME: Novo _pismo za stik"
 
-#~ msgid "FIXME: New _Message to Contact"
-#~ msgstr "FIXME: Novo sporoХilo za stik"
-
 #~ msgid "FIXME: New Meetin_g with Contact"
 #~ msgstr "FIXME: Nov sestanek s stikom"
 
@@ -6943,9 +7318,6 @@ msgstr "Skupina %i"
 #~ msgid "To-do list"
 #~ msgstr "Seznam za opravit"
 
-#~ msgid "Add..."
-#~ msgstr "Dodaj..."
-
 #~ msgid "Edit..."
 #~ msgstr "Uredi..."
 
@@ -7006,51 +7378,15 @@ msgstr "Skupina %i"
 #~ msgid "label8"
 #~ msgstr "oznaka8"
 
-#~ msgid "About to save changes to message..."
-#~ msgstr "Shranil bom spremembe sporoХila"
-
 #~ msgid "Load a previously saved message"
 #~ msgstr "Nalo╬i prej shranjeno sporoХilo"
 
-#~ msgid "_Save as..."
-#~ msgstr "Shrani kot..."
-
-#~ msgid "Save in _folder..."
-#~ msgstr "Shrani v _mapo..."
-
-#~ msgid "Save the message in a specified folder"
-#~ msgstr "Shrani sporoХilo v izbrano mapo"
-
-#~ msgid "_Insert text file... (FIXME)"
-#~ msgstr "_Vstavi datoteko z besedilom... (FIXME)"
-
-#~ msgid "Insert a file as text into the message"
-#~ msgstr "Vstavi datoteko v sporoХilo kot besedilo"
-
 #~ msgid "_Close..."
 #~ msgstr "_Zapri..."
 
 #~ msgid "_Format"
 #~ msgstr "_Oblika izpisa"
 
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Send the mail in HTML format"
-#~ msgstr "Po╧lji po╧to v HTML obliki"
-
-#~ msgid "Show _attachments"
-#~ msgstr "Ka╬i priloge"
-
-#~ msgid "Show/hide attachments"
-#~ msgstr "Ka╬i/skrij priloge"
-
-#~ msgid "Send this message"
-#~ msgstr "Po╧lji to sporoХilo"
-
-#~ msgid "Attach"
-#~ msgstr "Prilo╬i"
-
 #~ msgid "Check for new mail"
 #~ msgstr "Preveri za novo po╧to"
 
@@ -7066,9 +7402,6 @@ msgstr "Skupina %i"
 #~ msgid "Waiting for user to enter data"
 #~ msgstr "хakam na uporabnika, da vpi╧e podatek"
 
-#~ msgid "Online Status"
-#~ msgstr "Stanje priklopa"
-
 #~ msgid "From"
 #~ msgstr "Od"
 
@@ -7090,9 +7423,6 @@ msgstr "Skupina %i"
 #~ msgid "Fields"
 #~ msgstr "Polja"
 
-#~ msgid "Grouping"
-#~ msgstr "Grupiranje"
-
 #~ msgid "Sort"
 #~ msgstr "Sortiranje"
 
diff --git a/po/sv.po b/po/sv.po
index 72ed1c37f3..6944e8b46e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2000-12-12 00:05+0100\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\n"
 "PO-Revision-Date: 2000-12-12 00:08+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -473,99 +473,6 @@ msgstr "Element(en) tillhЖr dessa kategorier:"
 msgid "Available Categories:"
 msgstr "TillgДngliga kategorier:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1266
-msgid "Assistant"
-msgstr "Assistent"
-
-#: addressbook/contact-editor/e-contact-editor.c:1267
-#: addressbook/contact-editor/e-contact-editor.c:1371
-msgid "Business"
-msgstr "FЖretag"
-
-#: addressbook/contact-editor/e-contact-editor.c:1268
-msgid "Business 2"
-msgstr "FЖretag 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1269
-msgid "Business Fax"
-msgstr "FЖretagsfax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1270
-msgid "Callback"
-msgstr "Tillbakaringning"
-
-#: addressbook/contact-editor/e-contact-editor.c:1271
-msgid "Car"
-msgstr "Bil"
-
-#: addressbook/contact-editor/e-contact-editor.c:1272
-msgid "Company"
-msgstr "FЖretag"
-
-#: addressbook/contact-editor/e-contact-editor.c:1273
-#: addressbook/contact-editor/e-contact-editor.c:1372
-msgid "Home"
-msgstr "Hem"
-
-#: addressbook/contact-editor/e-contact-editor.c:1274
-msgid "Home 2"
-msgstr "Hem 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1275
-msgid "Home Fax"
-msgstr "Fax hem"
-
-#: addressbook/contact-editor/e-contact-editor.c:1276
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1277
-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
-msgid "Other"
-msgstr "Annat"
-
-#: addressbook/contact-editor/e-contact-editor.c:1279
-msgid "Other Fax"
-msgstr "Annan fax"
-
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Pager"
-msgstr "PersonsЖkare"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Primary"
-msgstr "PrimДr"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Radio"
-msgstr "Radio"
-
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Telex"
-msgstr "Telex"
-
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1328
-msgid "Primary Email"
-msgstr "PrimДr e-post"
-
-#: addressbook/contact-editor/e-contact-editor.c:1329
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1330
-msgid "Email 3"
-msgstr "E-post 3"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -643,6 +550,11 @@ msgstr "FЖretags_fax"
 msgid "_Mobile"
 msgstr "_Mobil"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "PrimДr e-post"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "F_Жretag"
@@ -722,6 +634,94 @@ msgstr "An_teckningar:"
 msgid "Details"
 msgstr "Detaljer"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "Assistent"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "FЖretag"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "FЖretag 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "FЖretagsfax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Tillbakaringning"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Bil"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "FЖretag"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Hem"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Hem 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Fax hem"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "Annat"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "Annan fax"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "PersonsЖkare"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "PrimДr"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radio"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Telex"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "E-post 3"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -940,6 +940,11 @@ msgstr "Markera namn"
 msgid "Select name from List:"
 msgstr "VДlj namn frЕn listan:"
 
+#: 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.
@@ -1075,11 +1080,6 @@ msgstr ""
 "\n"
 "Dubbelklicka hДr fЖr att skapa en ny kontakt."
 
-#: 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.
@@ -1486,7 +1486,7 @@ msgstr "Ingen sammanfattning finns tillgДnglig."
 #.
 #: 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:9
+#: po/tmp/evolution-message-composer.xml.h:8
 #: po/tmp/evolution-subscribe.xml.h:7
 msgid "Close"
 msgstr "StДng"
@@ -1740,33 +1740,6 @@ msgstr "minuter innan de sker."
 msgid "seconds."
 msgstr "sekunder."
 
-#: calendar/gui/dialogs/task-editor.c:695
-msgid "Edit Task"
-msgstr "Redigera uppgift"
-
-#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:335
-msgid "No summary"
-msgstr "Ingen sammanfattning"
-
-#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:341
-#, c-format
-msgid "Appointment - %s"
-msgstr "MЖte - %s"
-
-#: calendar/gui/dialogs/task-editor.c:710 calendar/gui/event-editor.c:344
-#, c-format
-msgid "Task - %s"
-msgstr "Uppgift - %s"
-
-#: calendar/gui/dialogs/task-editor.c:713 calendar/gui/event-editor.c:347
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Dagbokspost - %s"
-
-#: calendar/gui/dialogs/task-editor.c:1307 calendar/gui/event-editor.c:3277
-msgid "Do you want to save changes?"
-msgstr "Vill du spara Дndringar?"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1855,6 +1828,33 @@ msgstr "_Status:"
 msgid "task-editor-dialog"
 msgstr "task-editor-dialog"
 
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Redigera uppgift"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Ingen sammanfattning"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "MЖte - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Uppgift - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Dagbokspost - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr "Vill du spara Дndringar?"
+
 #: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "жppna..."
@@ -1944,40 +1944,6 @@ msgstr "Ta bort alla fЖrekomster"
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:329
-msgid "Edit Appointment"
-msgstr "Redigera mЖte"
-
-#: calendar/gui/event-editor.c:407
-msgid "on"
-msgstr "vid"
-
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
-msgid "day"
-msgstr "dag"
-
-#: calendar/gui/event-editor.c:559
-msgid "on the"
-msgstr "den"
-
-#: calendar/gui/event-editor.c:566
-msgid "th"
-msgstr ":e"
-
-#: calendar/gui/event-editor.c:722
-msgid "occurrences"
-msgstr "fЖrekomster"
-
-#: calendar/gui/event-editor.c:839
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Detta mЖte har upprepningsregler som inte kan redigeras med Evolution."
-
-#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr "%a %d %b %Y"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -2138,6 +2104,40 @@ msgstr "vecka"
 msgid "year(s)"
 msgstr "Еr"
 
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Redigera mЖte"
+
+#: calendar/gui/event-editor.c:407
+msgid "on"
+msgstr "vid"
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "dag"
+
+#: calendar/gui/event-editor.c:559
+msgid "on the"
+msgstr "den"
+
+#: calendar/gui/event-editor.c:566
+msgid "th"
+msgstr ":e"
+
+#: calendar/gui/event-editor.c:722
+msgid "occurrences"
+msgstr "fЖrekomster"
+
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Detta mЖte har upprepningsregler som inte kan redigeras med Evolution."
+
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
+msgid "%a %b %d %Y"
+msgstr "%a %d %b %Y"
+
 #: calendar/gui/getdate.y:391
 msgid "january"
 msgstr "januari"
@@ -2585,7 +2585,7 @@ msgstr "Aktuellt Еr (%Y)"
 msgid "Print Calendar"
 msgstr "Skriv ut kalender"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:953
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "FЖrhandsgranska"
 
@@ -2763,6 +2763,19 @@ msgstr "URL-strДngen \"%s\" innehЕller ett ogiltigt protokoll"
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Portnumret i URL:en \"%s\" bestЕr inte av siffror"
 
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
+"Kunde inte fЕ Kerberos-biljett:\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr "Felaktigt autentiseringssvar frЕn servern."
+
 #: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
@@ -2796,7 +2809,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:585
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -2851,57 +2864,193 @@ msgstr ""
 msgid "Could not create directory %s: %s"
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:223
-msgid "Could not create summary"
-msgstr "Kunde inte skapa sammanfattning"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr "BrevlЕdekataloger i UNIX-MH-format (CamelLocal-version)"
 
-#: camel/providers/mbox/camel-mbox-folder.c:378
-#: camel/providers/mbox/camel-mbox-folder.c:381
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr "FЖr lagrande av e-post i MH-liknande brevlЕdekataloger"
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr "BrevlЕdefiler i UNIX-mbox-format (CamelLocal-version)"
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr "FЖr lagrande av e-post i standard-mbox-format"
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr "UNIX-brevfiler i qmail-brevlЕdekatalogformat (CamelLocal-version)"
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr "FЖr lagrande av e-post i MH-liknande brevlЕdekataloger"
+
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr "Lagringsroten %s Дr inte en absolut sЖkvДg"
+
+#: camel/providers/local/camel-local-store.c:129
 #, c-format
-msgid "Cannot append message to mbox file: %s"
-msgstr "Kan inte lДgga till meddelande till mbox-filen: %s"
+msgid "Store root %s is not a regular directory"
+msgstr "Lagringsroten %s Дr ingen vanlig katalog"
 
-#: camel/providers/mbox/camel-mbox-folder.c:485
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Kan inte hДmta meddelande: %s"
+msgid "Cannot get folder: %s: %s"
+msgstr "Kan inte fЕ mapp: %s: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:34
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
-msgstr "BrevlЕdefiler i UNIX-mbox-format"
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr "Lokala lagringar har ingen rotmapp"
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr "Lokala lagringar har ingen standardmapp"
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr "Lokala mappar kan inte nДstlas."
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr "Lokal brevlЕdefil %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Kunde inte byta namn pЕ mappen %s till %s: %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+msgid "Cannot append message to maildir folder: %s: %s"
+msgstr "Kan inte lДgga till meddelande i mapp fЖr brevlЕdekatalog: %s: %s"
 
-#: camel/providers/local/camel-mbox-provider.c:36
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: 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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
 msgstr ""
-"FЖr lДsning av e-post som levereras av det lokala systemet och som lagras pЕ "
-"lokal disk."
+"Kan inte hДmta meddelande: %s\n"
+"  %s"
 
-#: camel/providers/local/camel-mbox-store.c:101
-#: camel/providers/mbox/camel-mbox-store.c:118
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: camel/providers/local/camel-mh-folder.c:183
+msgid "No such message"
+msgstr "Det finns inget sЕdant meddelande"
+
+#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-mh-folder.c:198
+msgid "Invalid message contents"
+msgstr "Ogiltigt meddelandeinnehЕll"
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Kan inte Жppna filen \"%s\":\n"
+"Kunde inte Жppna mappen \"%s\":\n"
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:106
 #: camel/providers/local/camel-mbox-store.c:108
 #: camel/providers/local/camel-mh-store.c:103
-#: camel/providers/mbox/camel-mbox-store.c:125
-#: camel/providers/mh/camel-mh-store.c:119
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Mappen \"%s\" finns inte."
 
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Kunde inte skapa mappen \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "\"%s\" Дr inte en brevlЕdekatalog."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Kunde inte ta bort mappen \"%s\": %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr "Дr inte en brevlЕdekatalog"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Kan inte Жppna brevlЕda: %s %s\n"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, c-format
+msgid "Cannot append message to mbox file: %s: %s"
+msgstr "Kan inte lДgga till meddelande till mbox-fil: %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
+#, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"Kan inte hДmta meddelande: %s frЕn mappen %s\n"
+"  %s"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr "Mappen verkar vara obotligt skadad."
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr "Meddelandebyggande misslyckades: Trasig brevlЕda?"
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Kan inte Жppna filen \"%s\":\n"
+"%s"
+
 #: camel/providers/local/camel-mbox-store.c:117
-#: camel/providers/mbox/camel-mbox-store.c:134
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2912,16 +3061,12 @@ msgstr ""
 
 #: camel/providers/local/camel-mbox-store.c:126
 #: camel/providers/local/camel-mbox-store.c:153
-#: camel/providers/mbox/camel-mbox-store.c:143
-#: camel/providers/mbox/camel-mbox-store.c:177
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" Дr ingen vanlig fil."
 
 #: camel/providers/local/camel-mbox-store.c:145
 #: camel/providers/local/camel-mbox-store.c:168
-#: camel/providers/mbox/camel-mbox-store.c:169
-#: camel/providers/mbox/camel-mbox-store.c:205
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2931,175 +3076,85 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-mbox-store.c:160
-#: camel/providers/mbox/camel-mbox-store.c:184
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Mappen \"%s\" Дr inte tom. Den togs inte bort."
 
-#: camel/providers/mbox/camel-mbox-store.c:222
+#: camel/providers/local/camel-mbox-summary.c:234
 #, c-format
-msgid "Could not rename folder %s to %s: destination exists"
-msgstr "Kunde inte byta namn pЕ mappen %s till %s: mЕlet existerar"
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr "Kunde inte Жppna mapp: %s: summerar frЕn position %ld: %s"
 
-#: camel/providers/mbox/camel-mbox-store.c:260
-msgid "Mbox folders may not be nested."
-msgstr "Mbox-mappar kan inte nДstlas."
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr "Allvarligt e-posttolkningsfel nДra position %ld i mappen %s"
 
-#: camel/providers/local/camel-local-store.c:200
-#: camel/providers/mbox/camel-mbox-store.c:274
+#: camel/providers/local/camel-mbox-summary.c:341
 #, c-format
-msgid "Local mail file %s"
-msgstr "Lokal brevlЕdefil %s"
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Kan inte summera mapp: %s: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:667
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
 #, c-format
-msgid "Could not open summary %s"
-msgstr "Kunde inte Жppna sammanfattningen %s"
+msgid "Could not open folder to summarise: %s: %s"
+msgstr "Kunde inte Жppna mapp fЖr att summera: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:491
-#: camel/providers/mbox/camel-mbox-summary.c:688
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Kan inte Жppna temporДr brevlЕda: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:734
-msgid "Summary mismatch, aborting sync"
-msgstr "Sammanfattningen stДmmer inte Жverens, avbryter synk"
-
-#: camel/providers/mbox/camel-mbox-summary.c:754
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr "Sammanfattningen stДmmer inte Жverens, avbryter synk"
+#: 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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr "Summeringen stДmmer inte Жverens, avbryter synk"
 
 #: camel/providers/local/camel-mbox-summary.c:562
-#: camel/providers/mbox/camel-mbox-summary.c:776
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Fel vid skrivning av temporДr brevlЕda: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:789
-#: camel/providers/mbox/camel-mbox-summary.c:807
+#: camel/providers/local/camel-mbox-summary.c:579
 #, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr "Kan inte kopiera data till utdatafil: %s"
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Fel vid skrivning till temporДr brevlЕda: %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:595
 #: camel/providers/local/camel-mbox-summary.c:748
-#: camel/providers/mbox/camel-mbox-summary.c:832
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Kunde inte stДnga kДllmappen %s: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:604
-#: camel/providers/mbox/camel-mbox-summary.c:841
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Kunde inte stДnga temporДra mapp: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:615
-#: camel/providers/mbox/camel-mbox-summary.c:849
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Kunde inte byta namn pЕ mapp: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:817
-#: camel/providers/mbox/camel-mbox-summary.c:861
 #, c-format
 msgid "Unknown error: %s"
 msgstr "OkДnt fel: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:213
-msgid "Could not load or create summary"
-msgstr "Kunde inte lДsa in eller skapa sammanfattning"
-
-#: camel/providers/mh/camel-mh-folder.c:336
-#: camel/providers/mh/camel-mh-folder.c:339
-#, c-format
-msgid "Cannot append message to mh folder: %s"
-msgstr "Kan inte lДgga till meddelande i mh-mapp: %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-mh-folder.c:183
-#: camel/providers/local/camel-mh-folder.c:189
-#: camel/providers/local/camel-mh-folder.c:197
-#: camel/providers/mh/camel-mh-folder.c:405
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Kan inte hДmta meddelande: %s\n"
-"  %s"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr "BrevlЕdekataloger i UNIX-MH-format"
-
-#: camel/providers/local/camel-local-provider.c:37
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr "FЖr lagrande av e-post i MH-liknande brevlЕdekataloger"
-
-#: camel/providers/local/camel-maildir-store.c:102
-#: camel/providers/local/camel-mh-store.c:96
-#: camel/providers/mh/camel-mh-store.c:112
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte Жppna mappen \"%s\":\n"
-"%s"
-
-#: camel/providers/local/camel-maildir-store.c:113
-#: camel/providers/local/camel-mh-store.c:109
-#: camel/providers/mh/camel-mh-store.c:127
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Kunde inte skapa mappen \"%s\":\n"
-"%s"
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Kan inte lДgga till meddelande i mh-mapp: %s: %s"
 
 #: camel/providers/local/camel-mh-store.c:116
-#: camel/providers/mh/camel-mh-store.c:136
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" Дr inte en katalog."
 
-#: camel/providers/local/camel-maildir-store.c:157
-#: camel/providers/local/camel-maildir-store.c:194
-#: camel/providers/local/camel-mh-store.c:133
-#: camel/providers/mh/camel-mh-store.c:155
-#: camel/providers/mh/camel-mh-store.c:168
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Kunde inte ta bort mappen \"%s\": %s"
-
-#: camel/providers/mh/camel-mh-store.c:186
-#: camel/providers/mh/camel-mh-store.c:190
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Kunde inte byta namn pЕ mappen \"%s\": %s"
-
-#: camel/providers/mh/camel-mh-store.c:194
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Kunde inte byta namn pЕ mappen \"%s\": %s existerar"
-
-#: camel/providers/mh/camel-mh-store.c:202
-msgid "MH folders may not be nested."
-msgstr "MH-mappar fЕr inte nДstlas."
-
-#: camel/providers/mh/camel-mh-store.c:214
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Lokal brevlЕdekatalog %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -3454,7 +3509,7 @@ msgstr "дmne:"
 msgid "Enter the subject of the mail"
 msgstr "Ange Дmnet pЕ brevet"
 
-#: composer/e-msg-composer.c:428
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3463,38 +3518,38 @@ msgstr ""
 "Kunde inte Жppna signaturfilen %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:598
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: composer/e-msg-composer.c:609
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Fel vid sparande av filen: %s"
 
-#: composer/e-msg-composer.c:629
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Fel vid inlДsning av filen: %s"
 
-#: composer/e-msg-composer.c:651
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Sparar Дndringar i meddelandet..."
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Sparar Дndringar i meddelande..."
 
-#: composer/e-msg-composer.c:694
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Fel vid sparande av alster i \"Drafts\": %s"
 
-#: composer/e-msg-composer.c:738 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:744
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3504,27 +3559,27 @@ msgstr ""
 "\n"
 "Vill du spara dina Дndringar?"
 
-#: composer/e-msg-composer.c:766
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "жppna fil"
 
-#: composer/e-msg-composer.c:892
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Den filen finns inte."
 
-#: composer/e-msg-composer.c:902
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Det Дr ingen vanlig fil."
 
-#: composer/e-msg-composer.c:912
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Den filen finns, men Дr inte lДsbar."
 
-#: composer/e-msg-composer.c:922
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Filen verkade Еtkomlig, men open(2) misslyckades."
 
-#: composer/e-msg-composer.c:944
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3532,15 +3587,15 @@ msgstr ""
 "Filen Дr mycket stor (stЖrre Дn 100kB).\n"
 "дr du sДker pЕ att du vill infoga den?"
 
-#: composer/e-msg-composer.c:965
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Ett fel uppstod vid lДsning av filen."
 
-#: composer/e-msg-composer.c:1342
+#: composer/e-msg-composer.c:1343
 msgid "Compose a message"
 msgstr "Skriv ett meddelande"
 
-#: composer/e-msg-composer.c:1419
+#: composer/e-msg-composer.c:1420
 msgid "Could not create composer window."
 msgstr "Kunde inte skapa fЖnster fЖr meddelanderedigering."
 
@@ -3548,7 +3603,7 @@ msgstr "Kunde inte skapa fЖnster fЖr meddelanderedigering."
 msgid "Cannot initialize Evolution's composer."
 msgstr "Kan inte initiera Evolutions e-postredigerare."
 
-#: filter/e-search-bar.c:175
+#: filter/e-search-bar.c:176
 msgid "Sear_ch"
 msgstr "S_Жk"
 
@@ -3682,15 +3737,15 @@ msgstr ""
 "Var vДnlig och gЕ tillbaka och ange en giltig mapp som e-post kan levereras "
 "till."
 
-#: filter/filter-folder.c:212 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 msgid "Select Folder"
 msgstr "VДlj mapp"
 
-#: filter/filter-folder.c:235
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr "Ange mappens URI"
 
-#: filter/filter-folder.c:281
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<klicka hДr fЖr att vДlja en mapp>"
 
@@ -3960,16 +4015,16 @@ msgstr "LДgg till regel fЖr virtuell mapp"
 msgid "Edit VFolder Rule"
 msgstr "Redigera regel fЖr virtuell mapp"
 
-#: mail/component-factory.c:203
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Kan inte initiera Evolutions e-postkomponent."
 
-#: mail/component-factory.c:242
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr "Kan inte registrera lagring hos skal"
 
 #: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:17
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Save"
 msgstr "Spara"
 
@@ -4021,7 +4076,7 @@ msgstr "Filtrera pЕ mottagare"
 msgid "Filter on Mailing List"
 msgstr "Filtrera pЕ sДndlista"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
 msgid "Open"
 msgstr "жppna"
 
@@ -4160,15 +4215,15 @@ msgstr ""
 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:543
+#: mail/mail-callbacks.c:552
 msgid "Move message(s) to"
 msgstr "Flytta meddelande(n) till"
 
-#: mail/mail-callbacks.c:545
+#: mail/mail-callbacks.c:554
 msgid "Copy message(s) to"
 msgstr "Kopiera meddelande(n) till"
 
-#: mail/mail-callbacks.c:656
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4176,11 +4231,11 @@ msgstr ""
 "Du kan bara redigera meddelanden\n"
 "som du sparat i mappen Drafts."
 
-#: mail/mail-callbacks.c:690 mail/mail-display.c:72
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
 msgid "Overwrite file?"
 msgstr "Skriv Жver fil?"
 
-#: mail/mail-callbacks.c:694 mail/mail-display.c:76
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4188,15 +4243,15 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas Жver?"
 
-#: mail/mail-callbacks.c:739
+#: mail/mail-callbacks.c:748
 msgid "Save Message As..."
 msgstr "Spara meddelande som..."
 
-#: mail/mail-callbacks.c:741
+#: mail/mail-callbacks.c:750
 msgid "Save Messages As..."
 msgstr "Spara meddelanden som..."
 
-#: mail/mail-callbacks.c:868
+#: mail/mail-callbacks.c:877
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4205,14 +4260,46 @@ msgstr ""
 "Fel vid lДsning av filterinformation:\n"
 "%s"
 
-#: mail/mail-callbacks.c:913
+#: mail/mail-callbacks.c:922
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/mail-callbacks.c:960
+#: mail/mail-callbacks.c:969
 msgid "Printing of message failed"
 msgstr "Utskrift av meddelande misslyckades"
 
+#.
+#. * 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
+msgid "Identity"
+msgstr "Identitet"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "E-postkonfiguration"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "E-postkДlla"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "E-posttransport"
+
+#: 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"
+
+#: po/tmp/mail-config-druid.glade.h:14
+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"
+
 #: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
@@ -4362,38 +4449,6 @@ msgstr "FrЕgar efter autentiseringsmЖjligheterna hos \"%s\""
 msgid "Query authorization at \"%s\""
 msgstr "FrЕga efter autentisering hos \"%s\""
 
-#.
-#. * 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
-msgid "Identity"
-msgstr "Identitet"
-
-#: po/tmp/mail-config-druid.glade.h:7
-msgid "Mail Configuration"
-msgstr "E-postkonfiguration"
-
-#: po/tmp/mail-config-druid.glade.h:8
-msgid "Mail Source"
-msgstr "E-postkДlla"
-
-#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
-msgid "Mail Transport"
-msgstr "E-posttransport"
-
-#: 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"
-
-#: po/tmp/mail-config-druid.glade.h:14
-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"
-
 #: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Adress"
@@ -4430,35 +4485,20 @@ msgstr "Skicka meddelanden som HTML"
 msgid "Sources"
 msgstr "KДllor"
 
-#: mail/mail-crypto.c:136
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Kunde inte skapa rЖr till %s: %s"
-
-#: mail/mail-crypto.c:163
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Kunde inte kЖra %s: %s\n"
-
-#: mail/mail-crypto.c:167
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr "Kan inte grena %s: %s"
-
-#: mail/mail-crypto.c:344 mail/mail-crypto.c:440 mail/mail-crypto.c:603
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Ange din lЖsenordsfras fЖr PGP/GPG."
 
-#: mail/mail-crypto.c:348 mail/mail-crypto.c:444 mail/mail-crypto.c:608
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr "Inget lЖsenord angavs."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:450 mail/mail-crypto.c:614
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Kunde inte skapa rЖr till GPG/PGP: %s"
 
-#: mail/mail-crypto.c:599
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Inget GPG/PGP-program finns tillgДngligt."
 
@@ -4536,31 +4576,31 @@ msgstr "Krypterat meddelande"
 msgid "Click icon to decrypt."
 msgstr "Klicka pЕ ikonen fЖr att dekryptera."
 
-#: mail/mail-format.c:1466
+#: mail/mail-format.c:1470
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pekare till FTP-plats (%s)"
 
-#: mail/mail-format.c:1478
+#: mail/mail-format.c:1482
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pekare till lokal fil (%s) giltig pЕ platsen \"%s\""
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1486
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pekare till lokal fil (%s)"
 
-#: mail/mail-format.c:1516
+#: mail/mail-format.c:1520
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pekare till okДnd extern data (typen \"%s\")"
 
-#: mail/mail-format.c:1521
+#: mail/mail-format.c:1525
 msgid "Malformed external-body part."
 msgstr "Felaktig del med extern meddelandetext."
 
-#: mail/mail-format.c:1691
+#: mail/mail-format.c:1695
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Den %s skrev %s:\n"
@@ -4746,152 +4786,152 @@ msgstr "Skanna mappar i \"%s\""
 msgid "(No description)"
 msgstr "(Ingen beskrivning)"
 
-#: mail/mail-ops.c:1427
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr "Bifogar meddelanden i mappen \"%s\""
 
-#: mail/mail-ops.c:1430
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr "Bifoga meddelanden i \"%s\""
 
-#: mail/mail-ops.c:1530
+#: mail/mail-ops.c:1535
 #, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Vidarebefordra meddelanden \"%s\""
 
-#: mail/mail-ops.c:1534
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr "Vidarebefordrar meddelande utan en Дmnesrad"
 
-#: mail/mail-ops.c:1537
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Vidarebefordra meddelande \"%s\""
 
-#: mail/mail-ops.c:1541
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr "Vidarebefordra ett meddelande utan en Дmnesrad"
 
-#: mail/mail-ops.c:1588
+#: mail/mail-ops.c:1593
 #, 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:1605
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 "Misslyckades med att generera mime-del frЕn meddelande nДr ett "
 "vidarebefordrat meddelande skulle genereras."
 
-#: mail/mail-ops.c:1660
+#: mail/mail-ops.c:1665
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1674
+#: mail/mail-ops.c:1679
 msgid "Forwarded message:\n"
 msgstr "Vidarebefordrat meddelande:\n"
 
-#: mail/mail-ops.c:1743
+#: mail/mail-ops.c:1748
 #, c-format
 msgid "Loading \"%s\""
 msgstr "LДser in \"%s\""
 
-#: mail/mail-ops.c:1745
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "LДs in \"%s\""
 
-#: mail/mail-ops.c:1848
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Skapar \"%s\""
 
-#: mail/mail-ops.c:1850
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Skapa \"%s\""
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr "Undantag vid rapportering av resultat till skalkomponentslyssnaren."
 
-#: mail/mail-ops.c:1944
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Synkroniserar \"%s\""
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Synkronisera \"%s\""
 
-#: mail/mail-ops.c:2010
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr "Visar meddelande-UID \"%s\""
 
-#: mail/mail-ops.c:2013
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr "TЖmmer meddelandevisningen"
 
-#: mail/mail-ops.c:2016
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr "Visa meddelande-UID \"%s\""
 
-#: mail/mail-ops.c:2019
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr "TЖm meddelandevisning"
 
-#: mail/mail-ops.c:2132
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr "жppnar meddelanden frЕn mappen \"%s\""
 
-#: mail/mail-ops.c:2135
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "жppnar meddelanden frЕn \"%s\""
 
-#: mail/mail-ops.c:2239
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr "LДser in mappen %s"
 
-#: mail/mail-ops.c:2241
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr "LДs in mappen %s"
 
-#: mail/mail-ops.c:2305
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr "Visar meddelanden frЕn mappen \"%s\""
 
-#: mail/mail-ops.c:2308
+#: mail/mail-ops.c:2313
 #, c-format
 msgid "View messages from \"%s\""
 msgstr "Visa meddelanden frЕn \"%s\""
 
-#: mail/mail-ops.c:2334
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "HДmtar meddelande %d av %d (uid \"%s\")"
 
-#: mail/mail-ops.c:2423
+#: mail/mail-ops.c:2428
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Sparar meddelanden frЕn mappen \"%s\""
 
-#: mail/mail-ops.c:2426
+#: mail/mail-ops.c:2431
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Spara meddelanden frЕn mappen \"%s\""
 
-#: mail/mail-ops.c:2469
+#: mail/mail-ops.c:2474
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Sparar meddelande %d av %d (uid \"%s\")"
@@ -4900,7 +4940,7 @@ msgstr "Sparar meddelande %d av %d (uid \"%s\")"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: mail/mail-summary.c:104 mail/mail-threads.c:728
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "Inkomplett meddelande skrevs pЕ rЖr!"
 
@@ -5340,6 +5380,16 @@ 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:43 po/tmp/evolution.xml.h:34
+#: shell/e-storage-set-view.c:235
+msgid "_View"
+msgstr "_Visa"
+
+#: shell/e-storage-set-view.c:235
+msgid "View the selected folder"
+msgstr "Visa den markade mappen"
+
 #: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "(Inget namn)"
@@ -5388,16 +5438,6 @@ msgstr "еtgДrden stЖds inte"
 msgid "The specified type is not supported in this storage"
 msgstr "Den angivna typen stЖds inte i detta lager"
 
-#: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:45 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
-msgid "_View"
-msgstr "_Visa"
-
-#: shell/e-storage-set-view.c:235
-msgid "View the selected folder"
-msgstr "Visa den markade mappen"
-
 #: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -5669,7 +5709,7 @@ 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:19
+#: po/tmp/evolution-message-composer.xml.h:18
 msgid "Save _As..."
 msgstr "Spara so_m..."
 
@@ -5697,7 +5737,7 @@ 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:40
+#: po/tmp/evolution-message-composer.xml.h:38
 #: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "_Arkiv"
@@ -5708,7 +5748,7 @@ 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:44
+#: po/tmp/evolution-message-composer.xml.h:42
 msgid "_Save"
 msgstr "_Spara"
 
@@ -5945,7 +5985,7 @@ 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
+#: po/tmp/evolution-message-composer.xml.h:10
 msgid "F_ormat"
 msgstr "F_ormat"
 
@@ -6022,7 +6062,7 @@ 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:22
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save the current file"
 msgstr "Spara aktuell fil"
 
@@ -6067,12 +6107,12 @@ 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:36
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "_About..."
 msgstr "_Om..."
 
 #: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "_Close"
 msgstr "S_tДng"
 
@@ -6081,12 +6121,12 @@ msgid "_Copy"
 msgstr "_Kopiera"
 
 #: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:38
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "_Debug"
 msgstr "Fels_Жk"
 
 #: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:39
+#: po/tmp/evolution-message-composer.xml.h:37
 #: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "R_edigera"
@@ -6100,7 +6140,7 @@ msgid "_Forms"
 msgstr "_FormulДr"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:41 po/tmp/evolution.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_HjДlp"
 
@@ -6332,99 +6372,91 @@ msgstr "Editor fЖr _virtuella mappar"
 msgid "Attach"
 msgstr "Bifoga"
 
-#: po/tmp/evolution-message-composer.xml.h:8
-msgid "Bold"
-msgstr "Fet"
-
-#: po/tmp/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:9
 msgid "Close the current file"
 msgstr "StДng aktuell fil"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:12
 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
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert text file..."
 msgstr "Infoga textfil..."
 
-#: po/tmp/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:15
 msgid "Open a file"
 msgstr "жppna en fil"
 
-#: po/tmp/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Spara som"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save in _folder... (FIXME)"
 msgstr "Spara i map_p... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save in folder..."
 msgstr "Spara i mapp..."
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save the current file with a different name"
 msgstr "Spara aktuell fil med ett annat namn"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save the message in a specified folder"
 msgstr "Spara meddelandet i angiven mapp"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Send"
 msgstr "Skicka"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Send _Later"
 msgstr "Skicka senar_e"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Send _later"
 msgstr "Skicka senar_e"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send the mail in HTML format"
 msgstr "Skicka brevet i HTML-format"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send the message later"
 msgstr "Skicka meddelandet senare"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send the message now"
 msgstr "Skicka meddelandet nu"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send this message now"
 msgstr "Skicka detta meddelande nu"
 
-#: po/tmp/evolution-message-composer.xml.h:32
-msgid "Sets something as bold"
-msgstr "SДtt nЕgonting till fetstil"
-
-#: po/tmp/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Show / hide attachments"
 msgstr "Visa/gЖm bilaga"
 
-#: po/tmp/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Show _attachments"
 msgstr "Visa _bilagor"
 
-#: po/tmp/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Show attachments"
 msgstr "Visa bilagor"
 
-#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Insert text file... (FIXME)"
 msgstr "_Infoga textfil... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:43
+#: po/tmp/evolution-message-composer.xml.h:41
 msgid "_Open..."
 msgstr "_жppna..."
 
@@ -6556,6 +6588,13 @@ msgstr "_InstДllningar"
 msgid "_Task (FIXME)"
 msgstr "_Uppgift (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
+msgid "%A, %B %d, %Y"
+msgstr "%A %d %B %Y"
+
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
 msgstr "PreliminДr"
@@ -6632,13 +6671,6 @@ msgstr "MЖtets slu_ttid:"
 msgid "All Attendees"
 msgstr "Alla nДrvarande"
 
-#. 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
-msgid "%A, %B %d, %Y"
-msgstr "%A %d %B %Y"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6669,176 +6701,78 @@ msgstr "%I.%M %p"
 msgid "Group %i"
 msgstr "Grupp %i"
 
-#: camel/providers/imap/camel-imap-auth.c:124
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Kunde inte fЕ Kerberos-biljett:\n"
-"%s"
+#~ msgid "Could not create summary"
+#~ msgstr "Kunde inte skapa sammanfattning"
 
-#: camel/providers/imap/camel-imap-auth.c:195
-msgid "Bad authentication response from server."
-msgstr "Felaktigt autentiseringssvar frЕn servern."
+#~ msgid "Cannot append message to mbox file: %s"
+#~ msgstr "Kan inte lДgga till meddelande till mbox-filen: %s"
 
-#: camel/providers/local/camel-local-provider.c:36
-msgid "UNIX MH-format mail directories (CamelLocal version)"
-msgstr "BrevlЕdekataloger i UNIX-MH-format (CamelLocal-version)"
-
-#: camel/providers/local/camel-local-provider.c:47
-msgid "UNIX mbox-format mail files (CamelLocal version)"
-msgstr "BrevlЕdefiler i UNIX-mbox-format (CamelLocal-version)"
-
-#: camel/providers/local/camel-local-provider.c:48
-msgid "For storing local mail in standard mbox format"
-msgstr "FЖr lagrande av e-post i standard-mbox-format"
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Kan inte hДmta meddelande: %s"
 
-#: camel/providers/local/camel-local-provider.c:58
-msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
-msgstr "UNIX-brevfiler i qmail-brevlЕdekatalogformat (CamelLocal-version)"
+#~ msgid "UNIX mbox-format mail files"
+#~ msgstr "BrevlЕdefiler i UNIX-mbox-format"
 
-#: camel/providers/local/camel-local-provider.c:59
-msgid "For storing local mail in qmail maildir directories"
-msgstr "FЖr lagrande av e-post i MH-liknande brevlЕdekataloger"
-
-#: camel/providers/local/camel-local-store.c:122
-#, c-format
-msgid "Store root %s is not an absolute path"
-msgstr "Lagringsroten %s Дr inte en absolut sЖkvДg"
-
-#: camel/providers/local/camel-local-store.c:129
-#, c-format
-msgid "Store root %s is not a regular directory"
-msgstr "Lagringsroten %s Дr ingen vanlig katalog"
-
-#: camel/providers/local/camel-local-store.c:137
-#: camel/providers/local/camel-local-store.c:153
-#, c-format
-msgid "Cannot get folder: %s: %s"
-msgstr "Kan inte fЕ mapp: %s: %s"
+#~ msgid ""
+#~ "For reading mail delivered by the local system, and for storing mail on "
+#~ "local disk."
+#~ msgstr ""
+#~ "FЖr lДsning av e-post som levereras av det lokala systemet och som lagras pЕ "
+#~ "lokal disk."
 
-#: camel/providers/local/camel-local-store.c:168
-msgid "Local stores do not have a root folder"
-msgstr "Lokala lagringar har ingen rotmapp"
+#~ msgid "Could not rename folder %s to %s: destination exists"
+#~ msgstr "Kunde inte byta namn pЕ mappen %s till %s: mЕlet existerar"
 
-#: camel/providers/local/camel-local-store.c:176
-msgid "Local stores do not have a default folder"
-msgstr "Lokala lagringar har ingen standardmapp"
+#~ msgid "Mbox folders may not be nested."
+#~ msgstr "Mbox-mappar kan inte nДstlas."
 
-#: camel/providers/local/camel-local-store.c:186
-msgid "Local folders may not be nested."
-msgstr "Lokala mappar kan inte nДstlas."
+#~ msgid "Could not open summary %s"
+#~ msgstr "Kunde inte Жppna sammanfattningen %s"
 
-#: camel/providers/local/camel-local-store.c:256
-#, c-format
-msgid "Could not rename folder %s to %s: %s"
-msgstr "Kunde inte byta namn pЕ mappen %s till %s: %s"
+#~ msgid "Summary mismatch, aborting sync"
+#~ msgstr "Sammanfattningen stДmmer inte Жverens, avbryter synk"
 
-#: camel/providers/local/camel-local-store.c:297
-#, c-format
-msgid "Could not delete folder summary file `%s': %s"
-msgstr "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
+#~ msgid "Summary mismatch, X-Evolution header missing"
+#~ msgstr "Sammanfattningen stДmmer inte Жverens, avbryter synk"
 
-#: camel/providers/local/camel-local-store.c:306
-#, c-format
-msgid "Could not delete folder index file `%s': %s"
-msgstr "Kunde inte ta bort mappindexfilen \"%s\": %s"
+#~ msgid "Cannot copy data to output file: %s"
+#~ msgstr "Kan inte kopiera data till utdatafil: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:148
-#: camel/providers/local/camel-maildir-folder.c:156
-#: camel/providers/local/camel-maildir-folder.c:167
-#, c-format
-msgid "Cannot append message to maildir folder: %s: %s"
-msgstr "Kan inte lДgga till meddelande i mapp fЖr brevlЕdekatalog: %s: %s"
-
-#: camel/providers/local/camel-maildir-folder.c:195
-#: camel/providers/local/camel-mbox-folder.c:311
-#: camel/providers/local/camel-mh-folder.c:183
-msgid "No such message"
-msgstr "Det finns inget sЕdant meddelande"
-
-#: camel/providers/local/camel-maildir-folder.c:213
-#: camel/providers/local/camel-mh-folder.c:198
-msgid "Invalid message contents"
-msgstr "Ogiltigt meddelandeinnehЕll"
-
-#: camel/providers/local/camel-maildir-store.c:128
-#, c-format
-msgid "`%s' is not a maildir directory."
-msgstr "\"%s\" Дr inte en brevlЕdekatalog."
-
-#: camel/providers/local/camel-maildir-store.c:158
-msgid "not a maildir directory"
-msgstr "Дr inte en brevlЕdekatalog"
-
-#: camel/providers/local/camel-mbox-folder.c:195
-#, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Kan inte Жppna brevlЕda: %s %s\n"
+#~ msgid "Could not load or create summary"
+#~ msgstr "Kunde inte lДsa in eller skapa sammanfattning"
 
-#: camel/providers/local/camel-mbox-folder.c:251
-#, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Kan inte lДgga till meddelande till mbox-fil: %s: %s"
+#~ msgid "Cannot append message to mh folder: %s"
+#~ msgstr "Kan inte lДgga till meddelande i mh-mapp: %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
-#, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Kan inte hДmta meddelande: %s frЕn mappen %s\n"
-"  %s"
+#~ msgid "UNIX MH-format mail directories"
+#~ msgstr "BrevlЕdekataloger i UNIX-MH-format"
 
-#: camel/providers/local/camel-mbox-folder.c:358
-msgid "The folder appears to be irrecoverably corrupted."
-msgstr "Mappen verkar vara obotligt skadad."
+#~ msgid "Could not rename folder `%s': %s"
+#~ msgstr "Kunde inte byta namn pЕ mappen \"%s\": %s"
 
-#: camel/providers/local/camel-mbox-folder.c:369
-msgid "Message construction failed: Corrupt mailbox?"
-msgstr "Meddelandebyggande misslyckades: Trasig brevlЕda?"
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Kunde inte byta namn pЕ mappen \"%s\": %s existerar"
 
-#: camel/providers/local/camel-mbox-summary.c:234
-#, c-format
-msgid "Could not open folder: %s: summarising from position %ld: %s"
-msgstr "Kunde inte Жppna mapp: %s: summerar frЕn position %ld: %s"
+#~ msgid "MH folders may not be nested."
+#~ msgstr "MH-mappar fЕr inte nДstlas."
 
-#: camel/providers/local/camel-mbox-summary.c:268
-#, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr "Allvarligt e-posttolkningsfel nДra position %ld i mappen %s"
+#~ msgid "Local mail directory %s"
+#~ msgstr "Lokal brevlЕdekatalog %s"
 
-#: camel/providers/local/camel-mbox-summary.c:341
-#, c-format
-msgid "Cannot summarise folder: %s: %s"
-msgstr "Kan inte summera mapp: %s: %s"
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Kunde inte skapa rЖr till %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:475
-#: camel/providers/local/camel-mbox-summary.c:661
-#, c-format
-msgid "Could not open folder to summarise: %s: %s"
-msgstr "Kunde inte Жppna mapp fЖr att summera: %s: %s"
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Kunde inte kЖra %s: %s\n"
 
-#: 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
-msgid "Summary and folder mismatch, even after a sync"
-msgstr "Summeringen stДmmer inte Жverens, avbryter synk"
+#~ msgid "Cannot fork %s: %s"
+#~ msgstr "Kan inte grena %s: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:579
-#, c-format
-msgid "Writing to tmp mailbox failed: %s: %s"
-msgstr "Fel vid skrivning till temporДr brevlЕda: %s: %s"
+#~ msgid "Bold"
+#~ msgstr "Fet"
 
-#: camel/providers/local/camel-mh-folder.c:147
-#: camel/providers/local/camel-mh-folder.c:155
-#, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Kan inte lДgga till meddelande i mh-mapp: %s: %s"
+#~ msgid "Sets something as bold"
+#~ msgstr "SДtt nЕgonting till fetstil"
 
 #~ msgid "Flagged"
 #~ msgstr "Flaggad"
diff --git a/po/tr.po b/po/tr.po
index b5b96dad9d..23d8d8299e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.3.1\n"
-"POT-Creation-Date: 2000-08-05 10:50+0200\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -13,481 +13,412 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/load-pine-addressbook.c:41
-#: addressbook/gui/component/addressbook-factory.c:59 calendar/gui/main.c:68
-msgid "Could not initialize Bonobo"
-msgstr "Bonobo'yu baЧlatamadЩm"
-
-#.
-#. * 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 :"
-
-#: addressbook/contact-editor/e-contact-editor.c:643
-#: calendar/gui/event-editor.c:1168
-msgid "FIXME: _Appointment"
-msgstr "ABY : _ToplantЩ"
-
-#: addressbook/contact-editor/e-contact-editor.c:644
-#: calendar/gui/event-editor.c:1169
-msgid "FIXME: Meeting Re_quest"
-msgstr "ABY : ToplantЩ is_teПi"
-
-#: addressbook/contact-editor/e-contact-editor.c:646
-#: calendar/gui/event-editor.c:1171
-msgid "FIXME: _Mail Message"
-msgstr "ABY : e_Posta iletisi"
-
-#: addressbook/contact-editor/e-contact-editor.c:647
-#: calendar/gui/event-editor.c:1172
-msgid "FIXME: _Contact"
-msgstr "ABY : _TanЩk"
-
-#: addressbook/contact-editor/e-contact-editor.c:648
-#: calendar/gui/event-editor.c:1173
-msgid "FIXME: _Task"
-msgstr "ABY : _GЖrev"
-
-#: addressbook/contact-editor/e-contact-editor.c:649
-#: calendar/gui/event-editor.c:1174
-msgid "FIXME: Task _Request"
-msgstr "ABY : GЖrev _isteПi"
-
-#: addressbook/contact-editor/e-contact-editor.c:650
-#: calendar/gui/event-editor.c:1175
-msgid "FIXME: _Journal Entry"
-msgstr "ABY : GЭ_nlЭk birimi"
-
-#: addressbook/contact-editor/e-contact-editor.c:651
-#: calendar/gui/event-editor.c:1176
-msgid "FIXME: _Note"
-msgstr "ABY : _Not"
-
-#: addressbook/contact-editor/e-contact-editor.c:653
-#: addressbook/contact-editor/e-contact-editor.c:758
-#: calendar/gui/event-editor.c:1178 calendar/gui/event-editor.c:1285
-msgid "FIXME: Ch_oose Form..."
-msgstr "ABY : SeГme _formu ..."
-
-#: addressbook/contact-editor/e-contact-editor.c:658
-#: calendar/gui/event-editor.c:1183
-msgid "FIXME: _Memo Style"
-msgstr "ABY : _AnЩ stili"
-
-#: addressbook/contact-editor/e-contact-editor.c:660
-#: calendar/gui/event-editor.c:1185
-msgid "FIXME: Define Print _Styles..."
-msgstr "ABY : YazdЩrma _stilini belirle"
-
-#: addressbook/contact-editor/e-contact-editor.c:667
-#: calendar/gui/event-editor.c:1192
-msgid "FIXME: S_end"
-msgstr "ABY : GЖ_nder"
-
-#: addressbook/contact-editor/e-contact-editor.c:671
-#: calendar/gui/event-editor.c:1196
-msgid "FIXME: Save Attac_hments..."
-msgstr "ABY : Eklem _ekle ..."
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: addressbook/contact-editor/e-contact-editor.c:673
-msgid "_Delete"
-msgstr "_Sil"
-
-#: addressbook/contact-editor/e-contact-editor.c:674
-#: calendar/gui/event-editor.c:1199
-msgid "FIXME: _Move to Folder..."
-msgstr "ABY : Dizine _taЧЩ ..."
-
-#: addressbook/contact-editor/e-contact-editor.c:675
-#: calendar/gui/event-editor.c:1200
-msgid "FIXME: Cop_y to Folder..."
-msgstr "ABY : Dizine _kopyala ..."
-
-#: addressbook/contact-editor/e-contact-editor.c:677
-#: calendar/gui/event-editor.c:1202
-msgid "Page Set_up"
-msgstr "Sayfa _kurulumu"
-
-#: addressbook/contact-editor/e-contact-editor.c:678
-#: calendar/gui/event-editor.c:1203
-msgid "FIXME: Print Pre_view"
-msgstr "ABY : YazdЩrma Жnizlemesi"
-
-#: addressbook/contact-editor/e-contact-editor.c:699
-#: calendar/gui/event-editor.c:1224
-msgid "FIXME: Paste _Special..."
-msgstr "ABY : ж_zel yapЩЧtЩr ..."
-
-#: addressbook/contact-editor/e-contact-editor.c:704
-#: calendar/gui/event-editor.c:1229
-msgid "FIXME: Mark as U_nread"
-msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
-
-#: addressbook/contact-editor/e-contact-editor.c:708
-#: calendar/gui/event-editor.c:1233
-msgid "_Object"
-msgstr "_Nesne"
-
-#: addressbook/contact-editor/e-contact-editor.c:713
-#: addressbook/contact-editor/e-contact-editor.c:720
-#: calendar/gui/event-editor.c:1238 calendar/gui/event-editor.c:1245
-msgid "FIXME: _Item"
-msgstr "ABY : _Birim"
-
-#: addressbook/contact-editor/e-contact-editor.c:714
-#: addressbook/contact-editor/e-contact-editor.c:721
-#: calendar/gui/event-editor.c:1239 calendar/gui/event-editor.c:1246
-msgid "FIXME: _Unread Item"
-msgstr "ABY : _OkunmamЩЧ birim"
-
-#: addressbook/contact-editor/e-contact-editor.c:715
-#: calendar/gui/event-editor.c:1240
-msgid "FIXME: Fi_rst Item in Folder"
-msgstr "ABY : Dizindeki _ilk birim"
-
-#: addressbook/contact-editor/e-contact-editor.c:722
-#: calendar/gui/event-editor.c:1247
-msgid "FIXME: _Last Item in Folder"
-msgstr "ABY : Dizindeki _son birim"
-
-#: addressbook/contact-editor/e-contact-editor.c:727
-#: calendar/gui/event-editor.c:1252
-msgid "FIXME: _Standard"
-msgstr "ABY : _Vasat"
-
-#: addressbook/contact-editor/e-contact-editor.c:729
-#: calendar/gui/event-editor.c:1254
-msgid "FIXME: __Formatting"
-msgstr "ABY : __чekillendirme"
-
-#: addressbook/contact-editor/e-contact-editor.c:732
-#: calendar/gui/event-editor.c:1257
-msgid "FIXME: _Customize..."
-msgstr "ABY : _жzelleЧtir ..."
-
-#: addressbook/contact-editor/e-contact-editor.c:737
-#: calendar/gui/event-editor.c:1262
-msgid "Pre_vious"
-msgstr "_Geri"
-
-#: addressbook/contact-editor/e-contact-editor.c:738
-#: calendar/gui/event-editor.c:1263
-msgid "Ne_xt"
-msgstr "_Ileri"
-
-#: addressbook/contact-editor/e-contact-editor.c:740
-#: calendar/gui/event-editor.c:1267
-msgid "_Toolbars"
-msgstr "_AraГ ГubuklarЩ"
-
-#: addressbook/contact-editor/e-contact-editor.c:745
-#: calendar/gui/event-editor.c:1272
-msgid "FIXME: _File..."
-msgstr "ABY : _Dosya ..."
-
-#: addressbook/contact-editor/e-contact-editor.c:746
-#: calendar/gui/event-editor.c:1273
-msgid "FIXME: It_em..."
-msgstr "ABY : Bi_rim ..."
-
-#: addressbook/contact-editor/e-contact-editor.c:747
-#: calendar/gui/event-editor.c:1274
-msgid "FIXME: _Object..."
-msgstr "ABY : _Nesne ..."
+#: addressbook/backend/ebook/e-card.c:3046
+#, fuzzy
+msgid "Card: "
+msgstr "Araba"
 
-#: addressbook/contact-editor/e-contact-editor.c:752
-#: calendar/gui/event-editor.c:1279
-msgid "FIXME: _Font..."
-msgstr "ABY : _YazЩ tipi ..."
+#: addressbook/backend/ebook/e-card.c:3048
+#, fuzzy
+msgid ""
+"\n"
+"Name: "
+msgstr "Isim :"
 
-#: addressbook/contact-editor/e-contact-editor.c:753
-#: calendar/gui/event-editor.c:1280
-msgid "FIXME: _Paragraph..."
-msgstr "ABY : _FЩkra ..."
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:760
-#: calendar/gui/event-editor.c:1287
-msgid "FIXME: Desi_gn This Form"
-msgstr "ABY : Bu formu _dЭzenle"
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:761
-#: calendar/gui/event-editor.c:1288
-msgid "FIXME: D_esign a Form..."
-msgstr "ABY : _Bir formu dЭzenle ..."
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:763
-#: calendar/gui/event-editor.c:1290
-msgid "FIXME: Publish _Form..."
-msgstr "ABY : _Formu aГЩkla ..."
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:764
-#: calendar/gui/event-editor.c:1291
-msgid "FIXME: Pu_blish Form As..."
-msgstr "ABY : Formu far_klЩ aГikla ..."
+#: addressbook/backend/ebook/e-card.c:3053
+#, fuzzy
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr "S_onek :"
 
-#: addressbook/contact-editor/e-contact-editor.c:766
-#: calendar/gui/event-editor.c:1293
-msgid "FIXME: Script _Debugger"
-msgstr "ABY : Denetlem ГЖ_zЭmleyicisi"
+#: addressbook/backend/ebook/e-card.c:3067
+#, fuzzy
+msgid ""
+"\n"
+"Birth Date: "
+msgstr "_DoПum gЭnЭ :"
 
-#: addressbook/contact-editor/e-contact-editor.c:771
-#: calendar/gui/event-editor.c:1298
-msgid "FIXME: _Spelling..."
-msgstr "ABY : _Imla ..."
+#: addressbook/backend/ebook/e-card.c:3078
+#, fuzzy
+msgid ""
+"\n"
+"Address:"
+msgstr "Adres :"
 
-#: addressbook/contact-editor/e-contact-editor.c:773
-#: calendar/gui/event-editor.c:1303
-msgid "_Forms"
-msgstr "_чekiller"
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:778
-msgid "FIXME: _New Contact"
-msgstr "ABY : _Yeni tanЩk"
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:779
-msgid "FIXME: New _Contact from Same Company"
-msgstr "ABY : AynЩ Чi_rketten yeni bir tanЩk"
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:781
-msgid "FIXME: New _Letter to Contact"
-msgstr "ABY : TanЩПa yeni bir _mektup"
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:782
-msgid "FIXME: New _Message to Contact"
-msgstr "ABY : TanЩПa yeni bir _ileti"
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:783
-msgid "FIXME: New Meetin_g with Contact"
-msgstr "ABY : TanЩkla yeni bir t_oplantЩ"
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:784
-msgid "FIXME: _Plan a Meeting..."
-msgstr "ABY : _Bir toplantЩyЩ tasarЩ et ..."
+#: addressbook/backend/ebook/e-card.c:3086
+msgid ""
+"\n"
+"  Country:     "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:785
-msgid "FIXME: New _Task for Contact"
-msgstr "ABY : TanЩk iГin yeni bir _gЖrev"
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:786
-msgid "FIXME: New _Journal Entry for Contact"
-msgstr "ABY : TanЩk iГin yeni bir gЭ_nlЭk birimi"
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:788
-msgid "FIXME: _Flag for Follow Up..."
-msgstr "ABY : I_letme iГin iЧaretle ..."
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:789
-msgid "FIXME: _Display Map of Address"
-msgstr "ABY : _Adresin haritasЩnЩ gЖster"
+#: addressbook/backend/ebook/e-card.c:3138
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr "2.nci ePosta adresi"
 
-#: addressbook/contact-editor/e-contact-editor.c:790
-msgid "FIXME: _Open Web Page"
-msgstr "ABY : _Websitesini aГ"
+#: addressbook/backend/ebook/e-card.c:3141
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:"
+msgstr "2.nci ePosta adresi"
 
-#: addressbook/contact-editor/e-contact-editor.c:792
-msgid "FIXME: Forward as _vCard"
-msgstr "ABY : v_Calendat Чeklinde ilet"
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:793
-#: calendar/gui/event-editor.c:1316
-msgid "FIXME: For_ward"
-msgstr "ABY : _Ilet"
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:805
-#: calendar/gui/event-editor.c:1329
-msgid "_Insert"
-msgstr "_IГer"
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:806
-#: calendar/gui/event-editor.c:1330
-msgid "F_ormat"
-msgstr "чeki_l"
+#: addressbook/backend/ebook/e-card.c:3178
+#, fuzzy
+msgid ""
+"\n"
+"Business Role: "
+msgstr "2.nci Meslek"
 
-#: addressbook/contact-editor/e-contact-editor.c:807
-#: calendar/gui/event-editor.c:1331 shell/e-shell-view-menu.c:510
-msgid "_Tools"
-msgstr "_гerezler"
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:808
-#: calendar/gui/event-editor.c:1332
-msgid "Actio_ns"
-msgstr "E_ylemler"
+#: addressbook/backend/ebook/e-card.c:3191
+#, fuzzy
+msgid ""
+"\n"
+"  Name:  "
+msgstr "Isim :"
 
-#: addressbook/contact-editor/e-contact-editor.c:839
-msgid "Save and Close"
-msgstr "Kaydet ve kapat"
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:840
-#: calendar/gui/event-editor.c:1371
-msgid "Save the appointment and close the dialog box"
-msgstr "ToplantЩyЩ kaydet ve diyaloПu kapat"
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:844
-#: calendar/gui/calendar-commands.c:674
-msgid "Print..."
-msgstr "YazdЩr ..."
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:845
-#: calendar/gui/event-editor.c:1376
-msgid "Print this item"
-msgstr "Bu birimi yazdЩrt"
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:848
-#: calendar/gui/event-editor.c:1377
-msgid "FIXME: Insert File..."
-msgstr "ABY : Dosya iГer ..."
+#: addressbook/backend/ebook/e-card.c:3199
+#, fuzzy
+msgid ""
+"\n"
+"Categories: "
+msgstr "tЭrler"
 
-#: addressbook/contact-editor/e-contact-editor.c:849
-#: calendar/gui/event-editor.c:1378
-msgid "Insert a file as an attachment"
-msgstr "Bir dosyayЩ eklem olarak ekle"
+#: addressbook/backend/ebook/e-card.c:3200
+#, fuzzy
+msgid ""
+"\n"
+"Comment: "
+msgstr "Birim anlatЩmЩ :"
 
-#. Delete
-#: addressbook/contact-editor/e-contact-editor.c:852
-#: addressbook/gui/component/addressbook.c:426 calendar/gui/gncal-todo.c:508
-#: mail/folder-browser-factory.c:39
-msgid "Delete"
-msgstr "Sil"
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:853
-#: calendar/gui/event-editor.c:1387 calendar/gui/gncal-todo.c:336
-msgid "Delete this item"
-msgstr "Bu birimi sil"
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:856
-#: calendar/gui/event-editor.c:1389
-msgid "FIXME: Previous"
-msgstr "ABY : Geri"
+#: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
+#: 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/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
+msgid "Could not initialize Bonobo"
+msgstr "Bonobo'yu baЧlatamadЩm"
 
-#: addressbook/contact-editor/e-contact-editor.c:857
-#: calendar/gui/event-editor.c:1390
-msgid "Go to the previous item"
-msgstr "Gerideki birime git"
+#. This array must be in the same order as enumerations
+#. in GnomePilotConduitSyncType as they are used as index.
+#. Custom type implies Disabled state.
+#.
+#: addressbook/conduit/address-conduit-control-applet.c:77
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:77
+#: calendar/conduits/todo/todo-conduit-control-applet.c:77
+msgid "Disabled"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:859
-#: calendar/gui/event-editor.c:1391
-msgid "FIXME: Next"
-msgstr "ABY : Ileri"
+#: addressbook/conduit/address-conduit-control-applet.c:78
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:78
+#: calendar/conduits/todo/todo-conduit-control-applet.c:78
+msgid "Synchronize"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:860
-#: calendar/gui/event-editor.c:1392
-msgid "Go to the next item"
-msgstr "Ilerideki birime git"
+#: addressbook/conduit/address-conduit-control-applet.c:79
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:79
+#: calendar/conduits/todo/todo-conduit-control-applet.c:79
+msgid "Copy From Pilot"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:862
-#: calendar/gui/event-editor.c:1393
-msgid "FIXME: Help"
-msgstr "ABY : YardЩm"
+#: addressbook/conduit/address-conduit-control-applet.c:80
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:80
+#: calendar/conduits/todo/todo-conduit-control-applet.c:80
+msgid "Copy To Pilot"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:863
-#: calendar/gui/event-editor.c:1394
-msgid "See online help"
-msgstr "YardЩma bak"
+#: addressbook/conduit/address-conduit-control-applet.c:81
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:81
+#: calendar/conduits/todo/todo-conduit-control-applet.c:81
+msgid "Merge From Pilot"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1278
-msgid "Assistant"
-msgstr "YardЩmcЩ"
+#: addressbook/conduit/address-conduit-control-applet.c:82
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:82
+#: calendar/conduits/todo/todo-conduit-control-applet.c:82
+msgid "Merge To Pilot"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1279
-#: addressbook/contact-editor/e-contact-editor.c:1383
-msgid "Business"
-msgstr "Meslek"
+#: addressbook/conduit/address-conduit-control-applet.c:121
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:121
+#: calendar/conduits/todo/todo-conduit-control-applet.c:121
+msgid "JP Rosevear <jpr@helixcode.com>"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Business 2"
-msgstr "2.nci Meslek"
+#: addressbook/conduit/address-conduit-control-applet.c:122
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:122
+#: calendar/conduits/todo/todo-conduit-control-applet.c:122
+msgid "Original Author:"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Business Fax"
-msgstr "Mesleki Faks"
+#: addressbook/conduit/address-conduit-control-applet.c:123
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:123
+#: calendar/conduits/todo/todo-conduit-control-applet.c:123
+msgid "Eskil Heyn Olsen <deity@eskil.dk>"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Callback"
-msgstr "Geri arama"
+#: addressbook/conduit/address-conduit-control-applet.c:127
+msgid "Evolution Addressbook Conduit"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1283
-msgid "Car"
-msgstr "Araba"
+#: addressbook/conduit/address-conduit-control-applet.c:128
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:128
+#: calendar/conduits/todo/todo-conduit-control-applet.c:128
+msgid "(C) 1998-2000 the Free Software Foundation and Helix Code"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1284
-msgid "Company"
-msgstr "чirket"
+#: addressbook/conduit/address-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution addressbook conduit.\n"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1285
-#: addressbook/contact-editor/e-contact-editor.c:1384
-msgid "Home"
-msgstr "Ev"
+#: addressbook/conduit/address-conduit-control-applet.c:131
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:131
+#: calendar/conduits/todo/todo-conduit-control-applet.c:131
+msgid "gnome-unknown.xpm"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1286
-msgid "Home 2"
-msgstr "2.nci ev"
+#: addressbook/conduit/address-conduit-control-applet.c:162
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:162
+#: calendar/conduits/todo/todo-conduit-control-applet.c:162
+msgid "Synchronize Action"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1287
-msgid "Home Fax"
-msgstr "Ev faksЩ"
+#: addressbook/conduit/address-conduit-control-applet.c:214
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:215
+#: calendar/conduits/todo/todo-conduit-control-applet.c:214
+msgid "Conduit state"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1288
-msgid "ISDN"
-msgstr "ISDN"
+#: addressbook/conduit/address-conduit-control-applet.c:266
+#: addressbook/conduit/address-conduit-control-applet.c:279
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:267
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:280
+#: calendar/conduits/todo/todo-conduit-control-applet.c:266
+#: calendar/conduits/todo/todo-conduit-control-applet.c:279
+msgid ""
+"No pilot configured, please choose the\n"
+"'Pilot Link Properties' capplet first."
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1289
-msgid "Mobile"
-msgstr "Cep"
+#: addressbook/conduit/address-conduit-control-applet.c:285
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:286
+#: calendar/conduits/todo/todo-conduit-control-applet.c:285
+msgid "Not connected to the gnome-pilot daemon"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1290
-#: addressbook/contact-editor/e-contact-editor.c:1385
-msgid "Other"
-msgstr "BaЧka"
+#: addressbook/conduit/address-conduit-control-applet.c:290
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:291
+#: calendar/conduits/todo/todo-conduit-control-applet.c:290
+msgid ""
+"An error occured when trying to fetch\n"
+"pilot list from the gnome-pilot daemon"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1291
-msgid "Other Fax"
-msgstr "BaЧka faks"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1292
-msgid "Pager"
-msgstr "Haberleyici"
+#: addressbook/conduit/address-conduit.c:210
+msgid "EBook not loaded\n"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1293
-msgid "Primary"
-msgstr "Ilk"
+#: addressbook/conduit/address-conduit.c:583
+#: calendar/conduits/calendar/calendar-conduit.c:715
+#: calendar/conduits/todo/todo-conduit.c:523
+msgid "Could not start wombat server"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1294
-msgid "Radio"
-msgstr "Radyo"
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
+#, fuzzy
+msgid "Could not start wombat"
+msgstr "Bonobo'yu baЧlatamadЩm"
 
-#: addressbook/contact-editor/e-contact-editor.c:1295
-msgid "Telex"
-msgstr "Teleks"
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
+msgid "Could not read pilot's Address application block"
+msgstr ""
 
-#: addressbook/contact-editor/e-contact-editor.c:1296
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
+#.
+#. * 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/e-contact-editor-strings.h:23
-#: addressbook/contact-editor/e-contact-editor.c:1340
-msgid "Primary Email"
-msgstr "Ilk ePosta adresi"
+#: addressbook/contact-editor/categories-strings.h:8
+msgid "Item(s) belong to these categories:"
+msgstr "Bu tЭrlere ait olan birimler :"
 
-#: addressbook/contact-editor/e-contact-editor.c:1341
-msgid "Email 2"
-msgstr "2.nci ePosta adresi"
+#: addressbook/contact-editor/categories-strings.h:9
+msgid "Available Categories:"
+msgstr "Varolan tЭrler :"
 
-#: addressbook/contact-editor/e-contact-editor.c:1342
-msgid "Email 3"
-msgstr "3.ncЭ ePosta adresi"
+#.
+#. * 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
+#, fuzzy
+msgid "Delete Contact?"
+msgstr "TanЩПЩ sil"
 
 #.
 #. * Translatable strings file generated by Glade.
@@ -498,6 +429,11 @@ msgstr "3.ncЭ ePosta adresi"
 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
+msgid "_Delete"
+msgstr "_Sil"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:9
 msgid "Phone Types"
 msgstr "Telefon tipleri"
@@ -507,7 +443,13 @@ msgstr "Telefon tipleri"
 msgid "New phone type"
 msgstr "Yeni telefon tipi"
 
+#.
+#. * 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
 msgid "Add"
 msgstr "Ekle"
 
@@ -532,50 +474,58 @@ msgid "Wants to receive _HTML mail"
 msgstr "_HTML ePostalarЩnЩ kabul ediyor"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:18
-msgid "Address:"
-msgstr "Adres :"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Business"
 msgstr "_Meslek"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:20
+#: addressbook/contact-editor/e-contact-editor-strings.h:19
 msgid "_Home"
 msgstr "_Ev"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:21
+#: addressbook/contact-editor/e-contact-editor-strings.h:20
 msgid "Business _Fax"
 msgstr "Mesleki _Faks"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor-strings.h:21
 msgid "_Mobile"
 msgstr "_Cep"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:24
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Ilk ePosta adresi"
+
+#: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr "_Meslek"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:25
+#: addressbook/contact-editor/e-contact-editor-strings.h:24
 msgid "_This is the mailing address"
 msgstr "_Bu ePostalaЧma adresidir"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:26
+#: addressbook/contact-editor/e-contact-editor-strings.h:25
 msgid "C_ontacts..."
 msgstr "_TanЩk ..."
 
-#: 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
 msgid "Ca_tegories..."
 msgstr "TЭ_rler ..."
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:28
+#: addressbook/contact-editor/e-contact-editor-strings.h:27
 msgid "_Job title:"
 msgstr "Meslek _tanЩmlamasЩ :"
 
-#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#: addressbook/contact-editor/e-contact-editor-strings.h:28
 msgid "_Company:"
 msgstr "ч_irket :"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:29
+#, fuzzy
+msgid "_Address..."
+msgstr "Adres"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr "Genel"
 
@@ -620,9 +570,151 @@ msgid "No_tes:"
 msgstr "_Notlar :"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Ince konular"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr "YardЩmcЩ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Meslek"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "2.nci Meslek"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Mesleki Faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr "Geri arama"
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Araba"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "чirket"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Ev"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "2.nci ev"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Ev faksЩ"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "BaЧka"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "BaЧka faks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Haberleyici"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Ilk"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Radyo"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Teleks"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "2.nci ePosta adresi"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "3.ncЭ ePosta adresi"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/fulladdr.glade.h:6
+#, fuzzy
+msgid "Address _2:"
+msgstr "Adres :"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:8
+#, fuzzy
+msgid "Check Address"
+msgstr "Adres"
+
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:10
+#, fuzzy
+msgid "Finland"
+msgstr "Bul"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:12
+#, fuzzy
+msgid "_Address:"
+msgstr "Adres :"
+
+#: po/tmp/fulladdr.glade.h:13
+#, fuzzy
+msgid "_City:"
+msgstr "_DoПum gЭnЭ :"
+
+#: po/tmp/fulladdr.glade.h:14
+msgid "_PO Box:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:15
+msgid "_State/Province:"
+msgstr ""
+
+#: po/tmp/fulladdr.glade.h:16
+msgid "_ZIP Code:"
+msgstr ""
+
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -633,26 +725,6 @@ msgid "Check Full Name"
 msgstr "Tam ismi kontrol et"
 
 #: addressbook/contact-editor/fullname-strings.h:8
-msgid "_Title:"
-msgstr "э_styazЩ :"
-
-#: addressbook/contact-editor/fullname-strings.h:9
-msgid "_First:"
-msgstr "_Ad :"
-
-#: addressbook/contact-editor/fullname-strings.h:10
-msgid "_Middle:"
-msgstr "_Orta eki :"
-
-#: addressbook/contact-editor/fullname-strings.h:11
-msgid "_Last:"
-msgstr "_Soyad :"
-
-#: addressbook/contact-editor/fullname-strings.h:12
-msgid "_Suffix:"
-msgstr "S_onek :"
-
-#: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
 "\n"
 "Mr.\n"
@@ -664,7 +736,7 @@ msgstr ""
 "Bn.\n"
 "Dr.\n"
 
-#: addressbook/contact-editor/fullname-strings.h:18
+#: addressbook/contact-editor/fullname-strings.h:13
 msgid ""
 "\n"
 "Sr.\n"
@@ -682,55 +754,45 @@ msgstr ""
 "III.\n"
 "Esq.\n"
 
-#: addressbook/gui/component/addressbook.c:420
-#: calendar/gui/calendar-commands.c:544
-msgid "New"
-msgstr "Yeni"
-
-#: addressbook/gui/component/addressbook.c:420
-msgid "Create a new contact"
-msgstr "Yeni bir tanЩk birimi yarat"
+#: addressbook/contact-editor/fullname-strings.h:21
+msgid "_First:"
+msgstr "_Ad :"
 
-#: addressbook/gui/component/addressbook.c:424
-msgid "Find"
-msgstr "Bul"
+#: addressbook/contact-editor/fullname-strings.h:22
+msgid "_Title:"
+msgstr "э_styazЩ :"
 
-#: addressbook/gui/component/addressbook.c:424
-msgid "Find a contact"
-msgstr "Bir tanЩПЩ bul"
+#: addressbook/contact-editor/fullname-strings.h:23
+msgid "_Middle:"
+msgstr "_Orta eki :"
 
-#: addressbook/gui/component/addressbook.c:425
-#: addressbook/gui/component/addressbook.c:493
-#: calendar/gui/calendar-commands.c:548 mail/folder-browser-factory.c:37
-msgid "Print"
-msgstr "YazdЩr"
+#: addressbook/contact-editor/fullname-strings.h:24
+msgid "_Last:"
+msgstr "_Soyad :"
 
-#: addressbook/gui/component/addressbook.c:425
-msgid "Print contacts"
-msgstr "TanЩklarЩy azdЩrt"
+#: addressbook/contact-editor/fullname-strings.h:25
+msgid "_Suffix:"
+msgstr "S_onek :"
 
-#: addressbook/gui/component/addressbook.c:426
-msgid "Delete a contact"
-msgstr "TanЩПЩ sil"
+#: addressbook/gui/component/addressbook.c:263
+msgid "As _Minicards"
+msgstr "_Ufak kartlar olarak"
 
-#: addressbook/gui/component/addressbook.c:500
-#: addressbook/gui/component/addressbook.c:1035
+#.
+#. * 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
 msgid "As _Table"
 msgstr "гi_zgiye olarak"
 
-#: addressbook/gui/component/addressbook.c:507
-msgid "_New Contact"
-msgstr "_Yeni tanЩk"
-
-#: addressbook/gui/component/addressbook.c:515
-msgid "N_ew Directory Server"
-msgstr "Yeni _dizin sunucusu"
-
-#: addressbook/gui/component/addressbook.c:594
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Adres defterini aГamadЩm"
 
-#: addressbook/gui/component/addressbook.c:599
+#: addressbook/gui/component/addressbook.c:391
+#, fuzzy
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -739,7 +801,7 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
 msgstr ""
 "Bu adres defterini aГamadЩk. Bu ya yanlЩЧ bir\n"
 "URI'nin verilmesinden dolayЩ ya da LDAP desteПi \n"
@@ -749,169 +811,213 @@ 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:939
-#: addressbook/gui/minicard/e-minicard.c:330
-msgid "Save as VCard"
-msgstr "VCard olarak kaydet"
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+msgid "Show All"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1006
-msgid "* Click here to add a contact *"
-msgstr "* Bir tanЩПЩ eklemek iГin buraya tЩkla *"
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+#, fuzzy
+msgid "Advanced..."
+msgstr "Ekle ..."
 
-#: addressbook/gui/component/addressbook.c:1042
-msgid "As _Minicards"
-msgstr "_Ufak kartlar olarak"
+#: addressbook/gui/component/addressbook.c:533
+msgid "Any field contains"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:534
+msgid "Name contains"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:1093
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "_Ufak ikonalar"
+
+#: addressbook/gui/component/addressbook.c:621
 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"
+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.
+#. * 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 :"
+
+#: po/tmp/ldap-server-dialog.glade.h:7
+msgid "LDAP Server:"
+msgstr "LDAP Sunucusu :"
+
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "Isim :"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
+msgid "Port Number:"
+msgstr "KapЩ no. :"
+
+#: po/tmp/ldap-server-dialog.glade.h:10
+msgid "Root DN:"
+msgstr "KЖk DN :"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/alphabet.glade.h:7
-msgid "window2"
-msgstr "pencere2"
+#: po/tmp/select-names.glade.h:6
+#, fuzzy
+msgid "Find..."
+msgstr "Bul"
+
+#: po/tmp/select-names.glade.h:7
+#, fuzzy
+msgid "Message Recipients"
+msgstr "AlЩcЩlar listesi :"
+
+#: po/tmp/select-names.glade.h:8
+#, fuzzy
+msgid "Select Names"
+msgstr "Stil adЩ :"
 
-#: addressbook/gui/component/alphabet.glade.h:8
+#: po/tmp/select-names.glade.h:9
+msgid "Select name from List:"
+msgstr ""
+
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+#, fuzzy
+msgid "Search"
+msgstr "Ara ..."
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/component/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr "a"
 
-#: addressbook/gui/component/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr "b"
 
-#: addressbook/gui/component/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr "c"
 
-#: addressbook/gui/component/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr "d"
 
-#: addressbook/gui/component/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr "e"
 
-#: addressbook/gui/component/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr "f"
 
-#: addressbook/gui/component/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr "g"
 
-#: addressbook/gui/component/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:131
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
-#: addressbook/gui/component/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr "i"
 
-#: addressbook/gui/component/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr "j"
 
-#: addressbook/gui/component/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr "k"
 
-#: addressbook/gui/component/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr "l"
 
-#: addressbook/gui/component/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr "m"
 
-#: addressbook/gui/component/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr "n"
 
-#: addressbook/gui/component/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr "o"
 
-#: addressbook/gui/component/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr "p"
 
-#: addressbook/gui/component/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr "q"
 
-#: addressbook/gui/component/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr "r"
 
-#: addressbook/gui/component/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr "s"
 
-#: addressbook/gui/component/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr "t"
 
-#: addressbook/gui/component/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr "u"
 
-#: addressbook/gui/component/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr "v"
 
-#: addressbook/gui/component/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr "w"
 
-#: addressbook/gui/component/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr "x"
 
-#: addressbook/gui/component/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr "y"
 
-#: addressbook/gui/component/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr "z"
 
-#.
-#. * 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/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
-msgid "Description:"
-msgstr "AnlatЩm :"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
-msgid "LDAP Server:"
-msgstr "LDAP Sunucusu :"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
-msgid "Port Number:"
-msgstr "KapЩ no. :"
-
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
-msgid "Root DN:"
-msgstr "KЖk DN :"
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
+msgid "Save as VCard"
+msgstr "VCard olarak kaydet"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-#: composer/e-msg-composer-address-dialog.glade.h:8
-msgid "Name:"
-msgstr "Isim :"
+#: addressbook/gui/widgets/e-minicard-control.c:278
+#, fuzzy
+msgid "Save in addressbook"
+msgstr "Adres defterini aГamadЩm"
 
-#: addressbook/gui/minicard/e-minicard-view.c:110
+#: addressbook/gui/widgets/e-minicard-view.c:111
 msgid ""
 "\n"
 "\n"
@@ -926,546 +1032,1136 @@ msgstr ""
 "Buraya Гift-tЩklayarak bir tanЩk birimini yarat."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Sayfa _kurulumu :"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Stil adЩ :"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "жnizleme :"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
+msgstr "10 punto Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "SeГenekler"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
+msgstr "8 punto Tahoma"
 
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr "IГer :"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
+msgstr "Sonda boЧ formlar olsun :"
 
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
-msgstr "BЖlЭmler :"
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "IГerik"
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
-msgstr "PeЧpeЧe"
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Alt :"
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
-msgstr "Mektup tab'lerinin tarafa koy"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Ebatlar :"
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr "Her bir mektup iГin ЭstyazЩ"
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "YazЩ tipi ..."
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr "Yeni bir sayfayla baЧla"
+#: po/tmp/e-contact-print.glade.h:13
+msgid "Fonts"
+msgstr "YazЩ tipleri"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "SЭtunlarЩn sayЩsЩ :"
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr "Son :"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr "Sonda boЧ formlar olsun :"
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "чekil"
 
-#: addressbook/printing/e-contact-print.glade.h:19
-msgid "Fonts"
-msgstr "YazЩ tipleri"
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "BaЧlЩk"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "YazЩ tipi ..."
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr "BaЧlЩk/son"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr "BaЧlЩklar"
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
-msgstr "10 punto Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
+msgstr "Her bir mektup iГin ЭstyazЩ"
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "IГerik"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "YЭkseklik :"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
-msgstr "8 punto Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
+msgstr "PeЧpeЧe"
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
-msgstr "GЖlgeleme"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
+msgstr "IГer :"
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
-msgstr "Gri gЖlgelemeyi kullanarak yazdЩrt"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Manzara"
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "чekil"
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Sol :"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "KaПЩt"
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
+msgstr "Mektup tab'lerinin tarafa koy"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Tip :"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Kenarlar"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-msgid "label26"
-msgstr "yafta26"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "SЭtunlarЩn sayЩsЩ :"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Ebatlar :"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "SeГenekler"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "En :"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Taraflama"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "YЭkseklik :"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Sayfa"
+
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "Sayfa _kurulumu :"
+
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "KaПЩt"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "KaПЩt kaynaПЩ :"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Kenarlar"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "Portre"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "эst :"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "жnizleme :"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Alt :"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr "Gri gЖlgelemeyi kullanarak yazdЩrt"
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Sol :"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr "Ikili sayfalarЩ ters Гevir"
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "SaП :"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Sayfa"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr "BЖlЭmler :"
+
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr "GЖlgeleme"
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Boyut :"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Taraflama"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Portre"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr "Yeni bir sayfayla baЧla"
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Manzara"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Stil adЩ :"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "BaЧlЩk"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "эst :"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr "Son :"
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Tip :"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr "Ikili sayfalarЩ ters Гevir"
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "En :"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr "BaЧlЩk/son"
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "yafta26"
 
-#: calendar/cal-util/timeutil.c:129 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 " Ж.Ж."
 
-#: calendar/cal-util/timeutil.c:129 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 " Ж.s"
 
-#: calendar/gui/calendar-commands.c:56
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:127
+#, fuzzy
+msgid "Evolution Calendar Conduit"
+msgstr "Evolution ГubuПu _kЩsayolu"
+
+#: calendar/conduits/calendar/calendar-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution calendar conduit.\n"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
+msgid "Error while communicating with calendar server"
+msgstr ""
+
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
+msgid "Could not read pilot's Calendar application block"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:127
+#, fuzzy
+msgid "Evolution ToDo Conduit"
+msgstr "Evolution ГubuПu _kЩsayolu"
+
+#: calendar/conduits/todo/todo-conduit-control-applet.c:130
+msgid "Configuration utility for the evolution todo conduit.\n"
+msgstr ""
+
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
+msgid "Could not read pilot's ToDo application block"
+msgstr ""
+
+#: calendar/gui/calendar-commands.c:60
 msgid "Outline:"
 msgstr "DЩЧlЩm :"
 
-#: calendar/gui/calendar-commands.c:57
+#: calendar/gui/calendar-commands.c:61
 msgid "Headings:"
 msgstr "BaЧlЩklar :"
 
-#: calendar/gui/calendar-commands.c:58
+#: calendar/gui/calendar-commands.c:62
 msgid "Empty days:"
 msgstr "BoЧ gЭnler :"
 
-#: calendar/gui/calendar-commands.c:59
+#: calendar/gui/calendar-commands.c:63
 msgid "Appointments:"
 msgstr "T_oplantЩlar :"
 
-#: calendar/gui/calendar-commands.c:60
+#: calendar/gui/calendar-commands.c:64
 msgid "Highlighted day:"
 msgstr "жne getirilmiЧ gЭn :"
 
-#: calendar/gui/calendar-commands.c:61
+#: calendar/gui/calendar-commands.c:65
 msgid "Day numbers:"
 msgstr "GЭn sayЩsЩ :"
 
-#: calendar/gui/calendar-commands.c:62
+#: calendar/gui/calendar-commands.c:66
 msgid "Current day's number:"
 msgstr "чu anki gЭnЭn numarasЩ :"
 
-#: calendar/gui/calendar-commands.c:63
+#: calendar/gui/calendar-commands.c:67
 msgid "To-Do item that is not yet due:"
 msgstr "Daha geГmemiЧ \"YapЩlacak\" birimi :"
 
-#: calendar/gui/calendar-commands.c:64
+#: 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/calendar-commands.c:65
+#: calendar/gui/calendar-commands.c:69
 msgid "To-Do item that is overdue:"
 msgstr "ZamanЩ geГmiЧ \"YapЩlacak\" birimi :"
 
-#: calendar/gui/calendar-commands.c:175
-msgid "Gnome Calendar"
-msgstr "Gnome Takvimi"
-
-#: calendar/gui/calendar-commands.c:178
-msgid "The GNOME personal calendar and schedule manager."
-msgstr "GNOME Чahsi takvim ve gЖrev yЖnetmeni ."
-
-#: calendar/gui/calendar-commands.c:434
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Dosya bulunamadЩ"
 
-#: calendar/gui/calendar-commands.c:456
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "Takvimi aГ"
 
-#: calendar/gui/calendar-commands.c:495
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Takvimi kaydet"
 
-#: calendar/gui/calendar-commands.c:522 calendar/gui/gncal-todo.c:722
-#: calendar/gui/gncal-todo.c:726
-msgid "Day"
-msgstr "GЭn"
-
-#: calendar/gui/calendar-commands.c:522
-msgid "Show 1 day"
-msgstr "1 gЭnЭ gЖster"
-
-#: calendar/gui/calendar-commands.c:525
-msgid "5 Days"
-msgstr "5 gЭn"
-
-#: calendar/gui/calendar-commands.c:525
-msgid "Show the working week"
-msgstr "гalЩЧma haftasЩnЩ gЖster"
-
-#: calendar/gui/calendar-commands.c:528 calendar/gui/gncal-todo.c:721
-msgid "Week"
-msgstr "Hafta"
-
-#: calendar/gui/calendar-commands.c:528
-msgid "Show 1 week"
-msgstr "2 haftayЩ Жster"
-
-#: calendar/gui/calendar-commands.c:531
-msgid "Month"
-msgstr "Ay"
-
-#: calendar/gui/calendar-commands.c:531
-msgid "Show 1 month"
-msgstr "1 ayЩ gЖster"
-
-#: calendar/gui/calendar-commands.c:535
-msgid "Year"
-msgstr "YЩl"
-
-#: calendar/gui/calendar-commands.c:535
-msgid "Show 1 year"
-msgstr "1 seneyi gЖster"
-
-#: calendar/gui/calendar-commands.c:544 calendar/gui/calendar-commands.c:683
-msgid "Create a new appointment"
-msgstr "Yeni bir toplantЩ"
+#. strftime format of a weekday and a date.
+#: calendar/gui/calendar-model.c:282
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
+#, fuzzy
+msgid "%a %m/%d/%Y"
+msgstr "%a %b %d %Y"
 
-#: calendar/gui/calendar-commands.c:548 calendar/gui/calendar-commands.c:675
-msgid "Print this calendar"
-msgstr "Bu takvimi yazdЩrt"
+#. 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
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:552
-msgid "Prev"
-msgstr "Geri"
+#. 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
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:552
-msgid "Go back in time"
-msgstr "Zamanda geri git"
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
+msgid "Public"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:553
-msgid "Today"
-msgstr "BugЭn"
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
+#, fuzzy
+msgid "Private"
+msgstr "YazdЩr"
 
-#: calendar/gui/calendar-commands.c:553
-msgid "Go to present time"
-msgstr "чimdiki zamana git"
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
+msgid "Confidential"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:554
-msgid "Next"
-msgstr "Ileri"
+#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#, fuzzy
+msgid "Unknown"
+msgstr "Bilinmeyen hata"
 
-#: calendar/gui/calendar-commands.c:554
-msgid "Go forward in time"
-msgstr "Zamanda ileri git"
+#: calendar/gui/calendar-model.c:441
+msgid "N"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:558
-msgid "Go to"
-msgstr "Git"
+#: calendar/gui/calendar-model.c:441
+#, fuzzy
+msgid "S"
+msgstr "Paz."
 
-#: calendar/gui/calendar-commands.c:558
-msgid "Go to a specific date"
-msgstr "Belirli bir tarihe git"
+#: calendar/gui/calendar-model.c:443
+msgid "E"
+msgstr ""
 
-#. file menu
-#: calendar/gui/calendar-commands.c:660
-msgid "New Ca_lendar"
-msgstr "Yeni _takvim"
+#: calendar/gui/calendar-model.c:443
+#, fuzzy
+msgid "W"
+msgstr "гarЧ."
 
-#: calendar/gui/calendar-commands.c:661
-msgid "Create a new calendar"
-msgstr "Yeni bir takvimi yarat"
+#: calendar/gui/calendar-model.c:515
+#, fuzzy
+msgid "Transparent"
+msgstr "ePosta transferi"
 
-#: calendar/gui/calendar-commands.c:664
-msgid "Open Ca_lendar"
-msgstr "_Takvimi aГ"
+#: calendar/gui/calendar-model.c:518
+msgid "Opaque"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:665
-msgid "Open a calendar"
-msgstr "Bir takvimi aГ"
+#: calendar/gui/calendar-model.c:744
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:669 calendar/gui/calendar-commands.c:670
-msgid "Save Calendar As"
-msgstr "Takvimi farklЩ kaydet"
+#. strptime format for a date.
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+msgid "%m/%d/%Y"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:683
-msgid "_New appointment..."
-msgstr "_Yeni toplantЩ ..."
+#. 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
+msgid "%I:%M:%S %p%n"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:688
-msgid "New appointment for _today..."
-msgstr "_BugЭn iГin yeni bir toplantЩ ..."
+#. strptime format for a time of day, in 24-hour format.
+#: calendar/gui/calendar-model.c:866
+msgid "%H:%M:%S%n"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:689
-msgid "Create a new appointment for today"
-msgstr "BugЭn iГin yeni bir toplantЩ yarat"
+#. 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
+msgid "%I:%M %p%n"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:697 calendar/gui/prop.c:712
-msgid "Preferences"
-msgstr "Ayarlar"
+#. strptime format for time of day, without seconds 24-hour format.
+#: calendar/gui/calendar-model.c:873
+msgid "%H:%M%n"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:704 calendar/gui/calendar-commands.c:705
-msgid "About Calendar"
-msgstr "TakvЩm bilgisi"
+#: calendar/gui/calendar-model.c:993
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
 
-#. i18n: This "%s%s" indicates possession. Languages where the order is
-#. * the inverse should translate it to "%2$s%1$s".
-#.
-#: calendar/gui/calendar-commands.c:747
-#, c-format
-msgid "%s%s"
-msgstr "%s%s"
+#: calendar/gui/calendar-model.c:1033
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:747
-msgid "'s calendar"
-msgstr "'in takvimi"
+#: calendar/gui/calendar-model.c:1073
+msgid "The priority must be between 1 and 9, inclusive"
+msgstr ""
 
-#: calendar/gui/control-factory.c:136
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "Takvimin gЖsterecek olduПu URI"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:181
+#: calendar/gui/dialogs/alarm-notify-dialog.c:183
 msgid "Alarm on %A %b %d %Y %H:%M"
 msgstr "%A %b %d %Y %H:%M'de ikaz et"
 
-#: calendar/gui/dialogs/alarm-notify-dialog.c:188
+#: calendar/gui/dialogs/alarm-notify-dialog.c:190
 msgid "Notification about your appointment on %A %b %d %Y %H:%M"
 msgstr "%A %b %d %Y %H:%M'deki toplantЩ iГin bildirme"
 
+#: calendar/gui/dialogs/alarm-notify-dialog.c:201
+#, fuzzy
+msgid "No summary available."
+msgstr "Toplama yok"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
+#: 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
 msgid "Close"
 msgstr "Kapat"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1070
-msgid "Snooze"
-msgstr "Ikaz et"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "ToplantЩyЩ deПiЧtir"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: 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
 msgid "Snooze time (minutes)"
 msgstr "Ikaz zamanЩ ( dakika )"
 
-#: calendar/gui/e-day-view-time-item.c:391
+#.
+#. * 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
+#, fuzzy
+msgid "05 minutes"
+msgstr "dakika"
+
+#: po/tmp/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "10 minutes"
+msgstr "dakika"
+
+#: po/tmp/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "12 hour (am/pm)"
+msgstr "12 saat (Ж.Ж./Ж.s.)"
+
+#: po/tmp/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "15 minutes"
+msgstr "dakika"
+
+#: po/tmp/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "24 hour"
+msgstr "24 saat"
+
+#: po/tmp/cal-prefs-dialog.glade.h:11
+#, fuzzy
+msgid "30 minutes"
+msgstr "dakika"
+
+#: po/tmp/cal-prefs-dialog.glade.h:12
+#, fuzzy
+msgid "60 minutes"
+msgstr "dakika"
+
+#: po/tmp/cal-prefs-dialog.glade.h:13
+#, fuzzy
+msgid "Alarms timeout after"
+msgstr "Sedai ikazlarЩ kapatma zamanЩ"
+
+#: po/tmp/cal-prefs-dialog.glade.h:14
+#, fuzzy
+msgid "Audio Alarms"
+msgstr "Ikazlar"
+
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Calendar"
+msgstr "Yeni _takvim"
+
+#: po/tmp/cal-prefs-dialog.glade.h:17
+#, fuzzy
+msgid "Calendar Preferences"
+msgstr "Ayarlar"
+
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Renkler"
+
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:20
+msgid "Date navigator options"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
+msgstr "Ince ayarlar"
+
+#: po/tmp/cal-prefs-dialog.glade.h:22
+#, fuzzy
+msgid "Display options"
+msgstr "\"YapЩlacak\" stil seГenekleri :"
+
+#: po/tmp/cal-prefs-dialog.glade.h:23
+msgid "Due Date"
+msgstr "Tarihe gЖre"
+
+#: po/tmp/cal-prefs-dialog.glade.h:24
+#, fuzzy
+msgid "Enable snoozing for"
+msgstr "IkazlamayЩ aГ :"
+
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr ""
+
+#: po/tmp/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
+msgid "Fri"
+msgstr "Cum"
+
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+#, fuzzy
+msgid "Friday"
+msgstr "cuma"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
+#, fuzzy
+msgid "Highlight"
+msgstr "жne getirilmiЧ gЭn :"
+
+#: po/tmp/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
+msgid "Items Due Today:"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
+msgstr ""
+
+#: po/tmp/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
+msgid "Mon"
+msgstr "P.t"
+
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Pazartesi"
+
+#: po/tmp/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
+msgid "Overdue Items:"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
+msgstr ""
+
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "жnem"
+
+#: po/tmp/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
+msgid "Reminders"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "C.t"
+
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+#, fuzzy
+msgid "Saturday"
+msgstr "cumartesi"
+
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:45
+#, fuzzy
+msgid "Show appointment end times"
+msgstr "ToplantЩ - %s"
+
+#: po/tmp/cal-prefs-dialog.glade.h:46
+#, fuzzy
+msgid "Show week numbers"
+msgstr "2 haftayЩ Жster"
+
+#: po/tmp/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
+msgid "Sun"
+msgstr "Paz"
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Pazar"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
+msgid "TaskPad"
+msgstr ""
+
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "Per"
+
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+#, fuzzy
+msgid "Thursday"
+msgstr "perЧembe"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
+msgstr "GeГmesine kalan zaman"
+
+#: po/tmp/cal-prefs-dialog.glade.h:54
+#, fuzzy
+msgid "Time divisions:"
+msgstr "%02i dakika bЖlmeleri"
+
+#: po/tmp/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
+msgid "Tue"
+msgstr "Sal"
+
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+#, fuzzy
+msgid "Tuesday"
+msgstr "salЩ"
+
+#: po/tmp/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
+msgid "Wed"
+msgstr "гar"
+
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+#, fuzzy
+msgid "Wednesday"
+msgstr "ГarЧamba"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
+#, fuzzy
+msgid "Work week"
+msgstr "Hafta"
+
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
+msgstr ""
+
+#: po/tmp/cal-prefs-dialog.glade.h:63
+#, fuzzy
+msgid "seconds."
+msgstr " saniye"
+
+#.
+#. * 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
+msgid "% Comp_lete:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:9
+#, fuzzy
+msgid "Cancelled"
+msgstr "Iptal"
+
+#: po/tmp/task-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Completed"
+msgstr "Yaz"
+
+#: po/tmp/task-editor-dialog.glade.h:12
+#, fuzzy
+msgid "Date Completed:"
+msgstr "Birim anlatЩmЩ :"
+
+#: po/tmp/task-editor-dialog.glade.h:14
+#, fuzzy
+msgid "High"
+msgstr "YЭkseklik :"
+
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr ""
+
+#: po/tmp/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
+msgid "None"
+msgstr "Yok"
+
+#: po/tmp/task-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Normal"
+msgstr "чekil"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:22
+#, fuzzy
+msgid "S_ummary"
+msgstr "Toplama"
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:24
+#, fuzzy
+msgid "Task"
+msgstr "GЖrev - %s"
+
+#: po/tmp/task-editor-dialog.glade.h:25
+msgid "URL:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:26
+#, fuzzy
+msgid "_Contacts..."
+msgstr "_TanЩk ..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+#, fuzzy
+msgid "_Due Date:"
+msgstr "Bu tarihe kadar :"
+
+#: po/tmp/task-editor-dialog.glade.h:28
+#, fuzzy
+msgid "_Priority:"
+msgstr "жnem :"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+#, fuzzy
+msgid "_Status:"
+msgstr "_ZЩpzak :"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr "Toplama yok"
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "ToplantЩ - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "GЖrev - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, 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
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
+#, fuzzy
+msgid "Open..."
+msgstr "_AГ ..."
+
+#: calendar/gui/e-calendar-table.c:337
+msgid "Open the task"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:339
+msgid "Mark Complete"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:340
+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"
+msgstr "Bu birimi sil"
+
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i dakika bЖlmeleri"
 
-#: 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
+#. 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-week-view-main-item.c:325
+#, fuzzy
+msgid "%A %d %B"
+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-week-view-main-item.c:334
+#, fuzzy
+msgid "%a %d %b"
+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-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
 msgid "New appointment..."
 msgstr "Yeni toplantЩ ..."
 
-#: 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
 msgid "Edit this appointment..."
 msgstr "Bu toplantЩyЩ deПiЧtir .."
 
-#: 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
 msgid "Delete this appointment"
 msgstr "Bu toplantЩyЩ sil"
 
-#: 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
 msgid "Make this appointment movable"
 msgstr "Bu toplantЩyЩ taЧЩnabilir yap"
 
-#: 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
 msgid "Delete this occurrence"
 msgstr "Bu oluЧumu sil"
 
-#: 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
 msgid "Delete all occurrences"
 msgstr "Yekin oluЧumlarЩ sil"
 
-#: calendar/gui/event-editor.c:291
-msgid "Edit Appointment"
-msgstr "ToplantЩyЩ deПiЧtir"
-
-#: calendar/gui/event-editor.c:296
-msgid "No summary"
-msgstr "Toplama yok"
+#. strftime format %d = day of month, %B = full
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-week-view-main-item.c:342
+msgid "%d %B"
+msgstr ""
 
-#: calendar/gui/event-editor.c:300
-#, c-format
-msgid "Appointment - %s"
-msgstr "ToplantЩ - %s"
+#.
+#. * 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
+msgid "A_ll day event"
+msgstr ""
 
-#: calendar/gui/event-editor.c:303
-#, c-format
-msgid "Task - %s"
-msgstr "GЖrev - %s"
+#: po/tmp/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "T_oplantЩlar :"
 
-#: calendar/gui/event-editor.c:306
-#, c-format
-msgid "Journal entry - %s"
-msgstr "GЭnlЭk birimi - %s"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr ""
 
-#. Owner, summary
-#: calendar/gui/event-editor.c:622 calendar/gui/event-editor.c:718
-msgid "?"
-msgstr "?"
+#: po/tmp/event-editor-dialog.glade.h:10
+#, fuzzy
+msgid "Custom recurrence"
+msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: calendar/gui/event-editor.c:1198
-msgid "FIXME: _Delete"
-msgstr "ABY : _Sil"
+#: po/tmp/event-editor-dialog.glade.h:11
+msgid "Days"
+msgstr "GЭn"
 
-#: calendar/gui/event-editor.c:1265
-msgid "FIXME: Ca_lendar..."
-msgstr "ABY : _Takvim ..."
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1300
-msgid "FIXME: Chec_k Names"
-msgstr "ABY : Isimleri gЖzden g_eГir"
+#: po/tmp/event-editor-dialog.glade.h:14
+#, fuzzy
+msgid "Exceptions"
+msgstr "SeГenekler"
 
-#: calendar/gui/event-editor.c:1301
-msgid "FIXME: Address _Book..."
-msgstr "ABY : Adres _defteri ..."
+#: po/tmp/event-editor-dialog.glade.h:16
+msgid "Hours"
+msgstr "Saat"
 
-#: calendar/gui/event-editor.c:1308
-msgid "FIXME: _New Appointment"
-msgstr "ABY : _Yeni toplantЩ"
+#: po/tmp/event-editor-dialog.glade.h:17
+#, fuzzy
+msgid "Mail _to:"
+msgstr "ePosta kaynaПЩ"
 
-#: calendar/gui/event-editor.c:1310
-msgid "FIXME: Rec_urrence..."
-msgstr "ABY : _Kaynaklar ..."
+#: po/tmp/event-editor-dialog.glade.h:18
+msgid "Minutes"
+msgstr "Dakika"
 
-#: calendar/gui/event-editor.c:1312
-msgid "FIXME: Invite _Attendees..."
-msgstr "ABY : _ZiyaretГileri davet et .."
+#: po/tmp/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Modify"
+msgstr "Pazartesi"
 
-#: calendar/gui/event-editor.c:1313
-msgid "FIXME: C_ancel Invitation..."
-msgstr "ABY : Daveti i_ptal et ..."
+#: po/tmp/event-editor-dialog.glade.h:20
+#, fuzzy
+msgid "No recurrence"
+msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: calendar/gui/event-editor.c:1315
-msgid "FIXME: Forward as v_Calendar"
-msgstr "ABY : v_Calendat Чeklinde ilet"
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "жnizleme :"
 
-#: calendar/gui/event-editor.c:1370
-msgid "FIXME: Save and Close"
-msgstr "ABY : KAydet ve kapat"
+#: po/tmp/event-editor-dialog.glade.h:22
+#, fuzzy
+msgid "Pri_vate"
+msgstr "GeГerli yap"
 
-#: calendar/gui/event-editor.c:1375
-msgid "FIXME: Print..."
-msgstr "ABY : YazdЩr ..."
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
+msgstr ""
 
-#: calendar/gui/event-editor.c:1380
-msgid "FIXME: Recurrence..."
+#: po/tmp/event-editor-dialog.glade.h:24
+#, fuzzy
+msgid "Recurrence"
 msgstr "ABY : GeliЧler ..."
 
-#: calendar/gui/event-editor.c:1381
-msgid "Configure recurrence rules"
+#: po/tmp/event-editor-dialog.glade.h:25
+#, fuzzy
+msgid "Recurrence Rule"
 msgstr "GeliЧ kurallarЩnЩ ayarla"
 
-#: calendar/gui/event-editor.c:1383
-msgid "FIXME: Invite Attendees..."
-msgstr "ABY : ZiyaretГileri davet et .."
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:27
+#, fuzzy
+msgid "Simple recurrence"
+msgstr "GeliЧ kurallarЩnЩ ayarla"
+
+#: po/tmp/event-editor-dialog.glade.h:28
+#, fuzzy
+msgid "Su_mmary:"
+msgstr "Toplama :"
+
+#: po/tmp/event-editor-dialog.glade.h:29
+#, fuzzy
+msgid "Time"
+msgstr "Kalan zaman"
+
+#: po/tmp/event-editor-dialog.glade.h:30
+#, fuzzy
+msgid "_Audio"
+msgstr "_Ekle"
+
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:32
+#, fuzzy
+msgid "_Display"
+msgstr "Zaman gЖsterimi"
+
+#: po/tmp/event-editor-dialog.glade.h:33
+#, fuzzy
+msgid "_End time:"
+msgstr "ToplantЩ bitiЧ saati :"
+
+#: po/tmp/event-editor-dialog.glade.h:34
+#, fuzzy
+msgid "_Mail"
+msgstr "_Cep"
+
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:37
+#, fuzzy
+msgid "_Start time:"
+msgstr "ToplantЩ baЧlama saati :"
+
+#: po/tmp/event-editor-dialog.glade.h:38
+msgid "_Starting date:"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:39
+#, fuzzy
+msgid "day(s)"
+msgstr "gЭn"
+
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:41
+#, fuzzy
+msgid "for"
+msgstr "dЭrdЭncЭ"
+
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:43
+#, fuzzy
+msgid "label21"
+msgstr "yafta1"
+
+#: po/tmp/event-editor-dialog.glade.h:44
+#, fuzzy
+msgid "month(s)"
+msgstr "ay"
+
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
+msgstr ""
+
+#: po/tmp/event-editor-dialog.glade.h:46
+#, fuzzy
+msgid "week(s)"
+msgstr "hafta"
+
+#: po/tmp/event-editor-dialog.glade.h:47
+#, fuzzy
+msgid "year(s)"
+msgstr "yЩl"
+
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "ToplantЩyЩ deПiЧtir"
+
+#: calendar/gui/event-editor.c:407
+#, fuzzy
+msgid "on"
+msgstr "P.t"
+
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "gЭn"
+
+#: calendar/gui/event-editor.c:559
+#, fuzzy
+msgid "on the"
+msgstr "Ay"
 
-#: calendar/gui/event-editor.c:1384
-msgid "Invite attendees to a meeting"
-msgstr "ZiyaretcЩleri davet et"
+#: calendar/gui/event-editor.c:566
+#, fuzzy
+msgid "th"
+msgstr "4.ncЭ"
 
-#: calendar/gui/event-editor.c:1386
-msgid "FIXME: Delete"
-msgstr "ABY : Sil"
+#: calendar/gui/event-editor.c:722
+#, fuzzy
+msgid "occurrences"
+msgstr "Yekin oluЧumlarЩ sil"
+
+#: calendar/gui/event-editor.c:839
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr ""
 
-#: calendar/gui/event-editor.c:1828
+#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
@@ -1565,11 +2261,11 @@ msgstr "cuma"
 msgid "saturday"
 msgstr "cumartesi"
 
-#: calendar/gui/getdate.y:420
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "yЩl"
 
-#: calendar/gui/getdate.y:421
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "ay"
 
@@ -1577,19 +2273,15 @@ msgstr "ay"
 msgid "fortnight"
 msgstr "geceleyin"
 
-#: calendar/gui/getdate.y:423
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "hafta"
 
-#: calendar/gui/getdate.y:424
-msgid "day"
-msgstr "gЭn"
-
-#: calendar/gui/getdate.y:425
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "saat"
 
-#: calendar/gui/getdate.y:426
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "dakika"
 
@@ -1597,7 +2289,7 @@ msgstr "dakika"
 msgid "min"
 msgstr "dak."
 
-#: calendar/gui/getdate.y:428
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "saniye"
 
@@ -1617,7 +2309,8 @@ msgstr "dЭn"
 msgid "today"
 msgstr "bugЭn"
 
-#: calendar/gui/getdate.y:438
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "Чimdi"
 
@@ -1682,152 +2375,42 @@ msgstr "onikinci"
 msgid "ago"
 msgstr "Жnce"
 
-#: calendar/gui/gncal-todo.c:140
-msgid "Create to-do item"
-msgstr "Bir \"YapЩlacak\" birimi yarat"
-
-#: calendar/gui/gncal-todo.c:140
-msgid "Edit to-do item"
-msgstr "Bir \"YapЩlacak\" birimini deПiЧtir"
-
-#: calendar/gui/gncal-todo.c:176
-msgid "Summary:"
-msgstr "Toplama :"
-
-#: calendar/gui/gncal-todo.c:186
-msgid "Due Date:"
-msgstr "Bu tarihe kadar :"
-
-#: calendar/gui/gncal-todo.c:195
-msgid "Priority:"
-msgstr "жnem :"
-
-#: calendar/gui/gncal-todo.c:212
-msgid "Item Comments:"
-msgstr "Birim anlatЩmЩ :"
-
-#: calendar/gui/gncal-todo.c:334
-msgid "Add to-do item..."
-msgstr "Bir \"YapЩlacak\" birimini ekle ..."
-
-#: calendar/gui/gncal-todo.c:335
-msgid "Edit this item..."
-msgstr "Bu birimi deПiЧtir ..."
-
-#: calendar/gui/gncal-todo.c:434
-msgid "Summary"
-msgstr "Toplama"
-
-#: calendar/gui/gncal-todo.c:435 calendar/gui/prop.c:604
-msgid "Due Date"
-msgstr "Tarihe gЖre"
-
-#: calendar/gui/gncal-todo.c:436 calendar/gui/prop.c:605
-#: mail/message-list.c:474
-msgid "Priority"
-msgstr "жnem"
-
-#: calendar/gui/gncal-todo.c:437
-msgid "Time Left"
-msgstr "Kalan zaman"
-
-#. Label
-#: calendar/gui/gncal-todo.c:449
-msgid "To-do list"
-msgstr "\"YapЩlacak\"'lar listesi"
-
-#. Add
-#: calendar/gui/gncal-todo.c:488
-#: composer/e-msg-composer-address-dialog.glade.h:13
-msgid "Add..."
-msgstr "Ekle ..."
-
-#. Edit
-#: calendar/gui/gncal-todo.c:497
-msgid "Edit..."
-msgstr "DeПiЧtir ..."
-
-#: calendar/gui/gncal-todo.c:721
-msgid "Weeks"
-msgstr "Hafta"
-
-#: calendar/gui/gncal-todo.c:722 calendar/gui/gncal-todo.c:726
-msgid "Days"
-msgstr "GЭn"
-
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
-msgid "Hours"
-msgstr "Saat"
-
-#: calendar/gui/gncal-todo.c:727 calendar/gui/gncal-todo.c:731
-msgid "Hour"
-msgstr "Saat"
-
-#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
-msgid "Minutes"
-msgstr "Dakika"
-
-#: calendar/gui/gncal-todo.c:732 calendar/gui/gncal-todo.c:736
-msgid "Minute"
-msgstr "Dakika"
+#: 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/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
-msgid "Seconds"
-msgstr "Saniye"
+#: calendar/gui/gnome-cal.c:1152
+#, c-format
+msgid "Could not load the calendar in `%s'"
+msgstr ""
 
-#: calendar/gui/gncal-todo.c:737 calendar/gui/gncal-todo.c:741
-msgid "Second"
-msgstr "Saniye"
+#: calendar/gui/gnome-cal.c:1163
+#, fuzzy, c-format
+msgid "Could not create a calendar in `%s'"
+msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: calendar/gui/gnome-cal.c:461 calendar/gui/gnome-cal.c:1078
-#: calendar/gui/gnome-cal.c:1134
-msgid "Reminder of your appointment at "
-msgstr "ToplantЩ anЩtlayЩcЩsЩ :"
+#: 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:1083 calendar/gui/gnome-cal.c:1138
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Oldu"
 
-#. Initialize by default to three-letter day names
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Paz"
-
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "P.t"
-
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Sal"
-
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "гar"
-
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Per"
-
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Cum"
-
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "C.t"
-
 #: calendar/gui/goto.c:82
 msgid "Year:"
 msgstr "YЩl :"
 
-#: calendar/gui/goto.c:264
+#: calendar/gui/goto.c:270
 msgid "Go to date"
 msgstr "Tarihe git"
 
 #. Instructions
-#: calendar/gui/goto.c:275
+#: 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"
@@ -1837,504 +2420,1086 @@ msgstr ""
 "Bir gЭne tЩkladЩПЩn zaman, o tarihe\n"
 "gideceksin."
 
-#: calendar/gui/goto.c:312
+#: calendar/gui/goto.c:318
 msgid "Go to today"
 msgstr "BugЭne git"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "1st"
 msgstr "1.nci"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "2nd"
 msgstr "2.nci"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "3rd"
 msgstr "3.ncЭ"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "4th"
 msgstr "4.ncЭ"
 
-#: calendar/gui/print.c:265
+#: calendar/gui/print.c:288
 msgid "5th"
 msgstr "5.nci"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "6th"
 msgstr "6.ncЩ"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "7th"
 msgstr "7.nci"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "8th"
 msgstr "8.nci"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "9th"
 msgstr "8.ncu"
 
-#: calendar/gui/print.c:266
+#: calendar/gui/print.c:289
 msgid "10th"
 msgstr "10.ncu"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "11th"
 msgstr "11.nci"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "12th"
 msgstr "12.nci"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "13th"
 msgstr "13.ncЭ"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "14th"
 msgstr "14.ncЭ"
 
-#: calendar/gui/print.c:267
+#: calendar/gui/print.c:290
 msgid "15th"
 msgstr "15.nci"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "16th"
 msgstr "16.ncЩ"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "17th"
 msgstr "17.nci"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "18th"
 msgstr "18.nci"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "19th"
 msgstr "19.ncu"
 
-#: calendar/gui/print.c:268
+#: calendar/gui/print.c:291
 msgid "20th"
 msgstr "20.nci"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "21st"
 msgstr "21.nci"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "22nd"
 msgstr "22.nci"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "23rd"
 msgstr "23.ncЭ"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "24th"
 msgstr "24.ncЭ"
 
-#: calendar/gui/print.c:269
+#: calendar/gui/print.c:292
 msgid "25th"
 msgstr "25.nci"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "26th"
 msgstr "26.ncЩ"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "27th"
 msgstr "27.nci"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "28th"
 msgstr "28.nci"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "29th"
 msgstr "29.ncu"
 
-#: calendar/gui/print.c:270
+#: calendar/gui/print.c:293
 msgid "30th"
 msgstr "39.ncu"
 
-#: calendar/gui/print.c:271
+#: calendar/gui/print.c:294
 msgid "31st"
 msgstr "31.nci"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Su"
 msgstr "Paz."
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Mo"
 msgstr "P.tesi"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Tu"
 msgstr "SalЩ"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "We"
 msgstr "гarЧ."
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Th"
 msgstr "PerЧ."
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Fr"
 msgstr "Cuma"
 
-#: calendar/gui/print.c:326
+#: calendar/gui/print.c:350
 msgid "Sa"
 msgstr "C.tesi"
 
-#: calendar/gui/print.c:868
-msgid "TODO Items"
-msgstr "\"YapЩlacak\" birimleri"
+#: calendar/gui/print.c:936
+#, fuzzy
+msgid "Tasks"
+msgstr "GЖrev - %s"
 
 #. Day
-#: calendar/gui/print.c:980
+#: calendar/gui/print.c:1066
 msgid "Current day (%a %b %d %Y)"
 msgstr "geГerli gЭn ( %a %b %d %Y )"
 
-#: calendar/gui/print.c:1000 calendar/gui/print.c:1014
-#: calendar/gui/print.c:1015
-msgid "%a"
-msgstr "%a"
+#: calendar/gui/print.c:1080 calendar/gui/print.c:1084
+#, fuzzy
+msgid "%a %b %d"
+msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1001 calendar/gui/print.c:1002
-#: calendar/gui/print.c:1016 calendar/gui/print.c:1017
-msgid "%b"
-msgstr "%b"
+#: calendar/gui/print.c:1081
+#, fuzzy
+msgid "%a %d %Y"
+msgstr "%a %b %d %Y"
 
-#: calendar/gui/print.c:1004
-#, c-format
-msgid "Current week (%s %s %d - %s %d %d)"
+#: calendar/gui/print.c:1092
+#, fuzzy, c-format
+msgid "Current week (%s - %s)"
 msgstr "GeГerli hafta ( %s %s %d - %s %d %d )"
 
-#: calendar/gui/print.c:1021
-#, c-format
-msgid "Current week (%s %s %d - %s %s %d %d)"
-msgstr "GeГerli hafta ( %s %s %d - %s %s %d %d )"
-
-#: calendar/gui/print.c:1027
-#, c-format
-msgid "Current week (%s %s %d %d - %s %s %d %d)"
-msgstr "GeГerli hafta ( %s %s %d %d - %s %s %d %d )"
-
 #. Month
-#: calendar/gui/print.c:1040
-msgid "Current month (%a %Y)"
+#: calendar/gui/print.c:1100
+#, fuzzy
+msgid "Current month (%b %Y)"
 msgstr "GeГerli ay ( %a %Y )"
 
 #. Year
-#: calendar/gui/print.c:1047
+#: calendar/gui/print.c:1107
 msgid "Current year (%Y)"
 msgstr "GeГerli yЩl ( %Y )"
 
-#: calendar/gui/print.c:1084
+#: calendar/gui/print.c:1144
 msgid "Print Calendar"
 msgstr "Takvimi yazdЩr"
 
-#: calendar/gui/print.c:1249
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "YazdЩrma Жnizlemesi"
 
-#: calendar/gui/prop.c:330
-msgid "Time display"
-msgstr "Zaman gЖsterimi"
+#. 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 ""
 
-#. Time format
-#: calendar/gui/prop.c:334
-msgid "Time format"
-msgstr "Zaman Чekli"
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+msgid "SMTWTFS"
+msgstr ""
 
-#: calendar/gui/prop.c:335
-msgid "12-hour (AM/PM)"
-msgstr "12 saat (Ж.Ж./Ж.s.)"
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, fuzzy, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: calendar/gui/prop.c:336
-msgid "24-hour"
-msgstr "24 saat"
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
 
-#. Weeks start on
-#: calendar/gui/prop.c:346
-msgid "Weeks start on"
-msgstr "Hafta'nЩn baЧlama gЭnЭ"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
 
-#: calendar/gui/prop.c:347
-msgid "Sunday"
-msgstr "Pazar"
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
 
-#: calendar/gui/prop.c:348
-msgid "Monday"
-msgstr "Pazartesi"
+#: camel/camel-movemail.c:99
+#, c-format
+msgid "Could not check mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:146
+#, c-format
+msgid "Could not open mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:156
+#, c-format
+msgid "Could not open temporary mail file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:197
+#, c-format
+msgid "Could not test lock file for %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:243
+#, fuzzy, c-format
+msgid "Error reading mail file: %s"
+msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
+
+#: camel/camel-movemail.c:254
+#, fuzzy, c-format
+msgid "Error writing mail temp file: %s"
+msgstr "`%s' dosyasЩnЩ kaydederken hata oldu"
+
+#: camel/camel-movemail.c:272
+#, c-format
+msgid "Failed to store mail in temp file %s: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:304
+#, fuzzy, c-format
+msgid "Could not create pipe: %s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
+
+#: camel/camel-movemail.c:316
+#, c-format
+msgid "Could not fork: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:354
+#, c-format
+msgid "Movemail program failed: %s"
+msgstr ""
+
+#: camel/camel-movemail.c:355
+#, fuzzy
+msgid "(Unknown error)"
+msgstr "Bilinmeyen hata"
+
+#: camel/camel-provider.c:133
+#, c-format
+msgid "Could not load %s: %s"
+msgstr ""
+
+#: camel/camel-provider.c:141
+#, c-format
+msgid "Could not load %s: No initialization code in module."
+msgstr ""
+
+#: camel/camel-remote-store.c:182
+#, c-format
+msgid "%s server %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:186
+#, c-format
+msgid "%s service for %s on %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:227
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr ""
+
+#: camel/camel-remote-store.c:228
+msgid "(unknown host)"
+msgstr ""
+
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
+#, c-format
+msgid "URL '%s' needs a username component"
+msgstr ""
+
+#: camel/camel-service.c:129
+#, c-format
+msgid "URL '%s' needs a host component"
+msgstr ""
+
+#: camel/camel-service.c:138
+#, c-format
+msgid "URL '%s' needs a path component"
+msgstr ""
+
+#: camel/camel-service.c:488
+#, c-format
+msgid "No such host %s."
+msgstr ""
+
+#: camel/camel-service.c:491
+#, c-format
+msgid "Temporarily unable to look up hostname %s."
+msgstr ""
 
-#. Day range
-#: calendar/gui/prop.c:358
-msgid "Day range"
-msgstr "GЭn sЩnЩrlarЩ"
+#: camel/camel-session.c:272
+#, c-format
+msgid "No provider available for protocol `%s'"
+msgstr ""
 
-#: calendar/gui/prop.c:369
+#: camel/camel-session.c:360
+#, fuzzy, c-format
 msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
+"Could not create directory %s:\n"
+"%s"
 msgstr ""
-"GЖn ve hafta bakЩЧЩnda gЖsterilinecek baЧlama ve\n"
-"bitme saatlerini belirle .\n"
-"Bu saatlerin dЩЧЩnda kalan saatler normal bakЩЧta\n"
-"gЖsterilmeyecektir."
+"%s dizinini yaratamadЩm\n"
+"\n"
+"Hata : %s"
 
-#: calendar/gui/prop.c:385
-msgid "Day start:"
-msgstr "GЭn baЧlangЩГЩ :"
+#: camel/camel-url.c:78
+#, c-format
+msgid "URL string `%s' contains no protocol"
+msgstr ""
 
-#: calendar/gui/prop.c:396
-msgid "Day end:"
-msgstr "GЭn bitimi :"
+#: camel/camel-url.c:93
+#, c-format
+msgid "URL string `%s' contains an invalid protocol"
+msgstr ""
 
-#: calendar/gui/prop.c:519
-msgid "Colors for display"
-msgstr "GЖsterim renkler"
+#: camel/camel-url.c:154
+#, c-format
+msgid "Port number in URL `%s' is non-numeric"
+msgstr ""
 
-#: calendar/gui/prop.c:522
-msgid "Colors"
-msgstr "Renkler"
+#: camel/providers/imap/camel-imap-auth.c:127
+#, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr ""
 
-#: calendar/gui/prop.c:599
-msgid "Show on TODO List:"
-msgstr "\"YapЩlacak\"'lar listesinde gЖster :"
+#: camel/providers/imap/camel-imap-auth.c:198
+msgid "Bad authentication response from server."
+msgstr ""
 
-#: calendar/gui/prop.c:606
-msgid "Time Until Due"
-msgstr "GeГmesine kalan zaman"
+#: camel/providers/imap/camel-imap-command.c:216
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr ""
 
-#: calendar/gui/prop.c:637
-msgid "To Do List style options:"
-msgstr "\"YapЩlacak\" stil seГenekleri :"
+#: camel/providers/imap/camel-imap-command.c:224
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr ""
 
-#: calendar/gui/prop.c:642
-msgid "Highlight overdue items"
-msgstr "ZamanЩ geГmiЧ birimleri \"gЖzЖnЭne\" ser"
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
+msgid "Unknown error"
+msgstr "Bilinmeyen hata"
 
-#: calendar/gui/prop.c:645
-msgid "Highlight not yet due items"
-msgstr "Daha zamanЩ geГmemiЧ bilgileri \"gЖzЖnЭne\" ser"
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr ""
 
-#: calendar/gui/prop.c:648
-msgid "Highlight items due today"
-msgstr "BugЭn zamanЩ dolacak birimleri \"gЖzЖnЭne\" ser"
+#: camel/providers/imap/camel-imap-command.c:407
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr ""
 
-#: calendar/gui/prop.c:678
-msgid "To Do List Properties"
-msgstr "\"YapЩlacak\"'lar listesi Жzellikler"
+#: camel/providers/imap/camel-imap-command.c:443
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr ""
 
-#: calendar/gui/prop.c:681
-msgid "To Do List"
-msgstr "\"YapЩlacak\"'lar listesi"
+#: camel/providers/imap/camel-imap-folder.c:216
+#, c-format
+msgid "Could not load summary for %s"
+msgstr ""
 
-#: calendar/gui/prop.c:780
-msgid "Alarms"
-msgstr "Ikazlar"
+#: camel/providers/imap/camel-imap-folder.c:586
+msgid "Could not find message body in FETCH response."
+msgstr ""
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:783
-msgid "Alarm Properties"
-msgstr "Ikaz Жzellikleri"
+#: camel/providers/imap/camel-imap-provider.c:39
+msgid "IMAPv4"
+msgstr ""
 
-#: calendar/gui/prop.c:793
-msgid "Beep on display alarms"
-msgstr "Ekran ikazlarЩnda tЩngЩrtЩ yap"
+#: camel/providers/imap/camel-imap-provider.c:41
+msgid "For reading and storing mail on IMAP servers."
+msgstr ""
 
-#: calendar/gui/prop.c:803
-msgid "Audio alarms timeout after"
-msgstr "Sedai ikazlarЩ kapatma zamanЩ"
+#: 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"
 
-#: calendar/gui/prop.c:814 calendar/gui/prop.c:831
-msgid " seconds"
-msgstr " saniye"
+#: camel/providers/imap/camel-imap-store.c:236
+msgid "This option will connect to the IMAP server using a plaintext password."
+msgstr ""
 
-#: calendar/gui/prop.c:820
-msgid "Enable snoozing for "
-msgstr "IkazlamayЩ aГ :"
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
+msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/prop.c:836
-msgid "Defaults"
-msgstr "Ince ayarlar"
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:183
-msgid "Cut"
-msgstr "Kes"
+#: camel/providers/imap/camel-imap-store.c:333
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:184
-msgid "Cut selected item into clipboard"
-msgstr "SeГili birimi arabelleПe kes"
+#: camel/providers/imap/camel-imap-store.c:359
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:187
-msgid "Copy"
-msgstr "Kopyala"
+#: camel/providers/imap/camel-imap-store.c:539
+#, fuzzy, c-format
+msgid "Could not create directory %s: %s"
+msgstr ""
+"%s dizinini yaratamadЩm\n"
+"\n"
+"Hata : %s"
 
-#: composer/e-msg-composer-address-dialog.c:188
-msgid "Copy selected item into clipboard"
-msgstr "SeГili birimi arabelleПe kopyala"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:191
-#: composer/e-msg-composer-address-dialog.c:199
-msgid "Paste"
-msgstr "YapЩЧtЩr"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:192
-#: composer/e-msg-composer-address-dialog.c:200
-msgid "Paste item from clipboard"
-msgstr "Birimi arabellekten yapЩЧtЩr"
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.c:528
-msgid "Select recipients' addresses"
-msgstr "GЖnderilecek adresleri belirle"
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+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.
-#.
-#: composer/e-msg-composer-address-dialog.glade.h:7
-msgid "Recipient list:"
-msgstr "AlЩcЩlar listesi :"
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:9
-msgid "Search..."
-msgstr "Ara ..."
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:10
-msgid "Name"
-msgstr "Isim"
+#: camel/providers/local/camel-local-store.c:122
+#, c-format
+msgid "Store root %s is not an absolute path"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:11
-msgid "Address"
-msgstr "Adres"
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "Bu normal bir dosya deПildir ."
 
-#: composer/e-msg-composer-address-dialog.glade.h:12
-msgid "Properties..."
-msgstr "жzellikler ..."
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr ""
+"%s dizinini yaratamadЩm\n"
+" "
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
+#, fuzzy, c-format
+msgid "Local mail file %s"
+msgstr "`%s' dosyasЩnЩ kaydederken hata oldu"
+
+#: camel/providers/local/camel-local-store.c:256
+#, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:297
+#, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:306
+#, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+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-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
+msgid "Invalid message contents"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
+#, c-format
+msgid ""
+"Could not open folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
+#, fuzzy, c-format
+msgid "Folder `%s' does not exist."
+msgstr "BЖyle bir dosya yok ."
+
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, fuzzy, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, c-format
+msgid "`%s' is not a maildir directory."
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr ""
+
+#: camel/providers/local/camel-maildir-store.c:158
+msgid "not a maildir directory"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr ""
+"%s dizinini yaratamadЩm\n"
+" "
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, fuzzy, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"DosyalarЩ `%s''ye\n"
+"kopyalayamadЩm ."
+
+#: camel/providers/local/camel-mbox-store.c:117
+#, fuzzy, c-format
+msgid ""
+"Could not create file `%s':\n"
+"%s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
+
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
+#, fuzzy, c-format
+msgid "`%s' is not a regular file."
+msgstr "Bu normal bir dosya deПildir ."
+
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
+#, c-format
+msgid ""
+"Could not delete folder `%s':\n"
+"%s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:160
+#, c-format
+msgid "Folder `%s' is not empty. Not deleted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:234
+#, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:341
+#, 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
+#, c-format
+msgid "Could not open folder to summarise: %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:491
+#, 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
+msgid "Summary and folder mismatch, even after a sync"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:562
+#, c-format
+msgid "Error writing to temp mailbox: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:14
-msgid "To: >>"
-msgstr "Gn : >>"
+#: camel/providers/local/camel-mbox-summary.c:579
+#, 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
+#, c-format
+msgid "Could not close source folder %s: %s"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-summary.c:604
+#, fuzzy, c-format
+msgid "Could not close temp folder: %s"
+msgstr ""
+"%s dizinini yaratamadЩm\n"
+" "
+
+#: camel/providers/local/camel-mbox-summary.c:615
+#, fuzzy, c-format
+msgid "Could not rename folder: %s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
+
+#: camel/providers/local/camel-mbox-summary.c:817
+#, fuzzy, c-format
+msgid "Unknown error: %s"
+msgstr "Bilinmeyen hata"
+
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
+#, fuzzy, c-format
+msgid "Cannot append message to mh folder: %s: %s"
+msgstr "Iletiyi yeni bir dizine taЧЩ"
+
+#: camel/providers/local/camel-mh-store.c:116
+#, c-format
+msgid "`%s' is not a directory."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-auth.c:41
+#, c-format
+msgid "Please enter the NNTP password for %s@%s"
+msgstr ""
+
+#: 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:144
+#, fuzzy, c-format
+msgid "Message %s not found."
+msgstr "Dosya bulunamadЩ"
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:45
+msgid "Could not get group list from server."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
+#, c-format
+msgid "Unable to load grouplist file for %s: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
+#, c-format
+msgid "Unable to save grouplist file for %s: %s"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "Could not open directory for news server: %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:288
+#, c-format
+msgid "USENET News via %s"
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:295
+msgid ""
+"This option will authenticate with the NNTP server using a plaintext "
+"password."
+msgstr ""
+
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
+#, c-format
+msgid "Unable to open or create .newsrc file for %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:179
+msgid "Could not open folder: message listing was incomplete."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:273
+#, c-format
+msgid "No message with uid %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-folder.c:287
+#, c-format
+msgid "Could not retrieve message from POP server %s: %s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:34
+msgid "POP"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-provider.c:36
+msgid ""
+"For connecting to POP servers. The POP protocol can also be used to retrieve "
+"mail from certain web mail providers and proprietary email systems."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:150
+msgid ""
+"This option will connect to the POP server using a plaintext password. This "
+"is the only option supported by many POP servers."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:160
+msgid ""
+"This option will connect to the POP server using an encrypted password via "
+"the APOP protocol. This may not work for all users even on servers that "
+"claim to support it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:172
+msgid ""
+"This will connect to the POP server and use Kerberos 4 to authenticate to it."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:217
+#, c-format
+msgid "Could not authenticate to KPOP server: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:15
-msgid "Cc: >>"
-msgstr "Cc : >>"
+#: camel/providers/pop3/camel-pop3-store.c:335
+#, c-format
+msgid "Could not connect to POP server on %s."
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:389
+#, c-format
+msgid "%sPlease enter the POP3 password for %s@%s"
+msgstr ""
+
+#: camel/providers/pop3/camel-pop3-store.c:408
+#, 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
+#, fuzzy
+msgid "(Unknown)"
+msgstr "Bilinmeyen hata"
+
+#: camel/providers/pop3/camel-pop3-store.c:438
+msgid ""
+"Unable to connect to POP server.\n"
+"No support for requested authentication mechanism."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:16
-msgid "Bcc: >>"
-msgstr "Bcc : >>"
+#: camel/providers/pop3/camel-pop3-store.c:446
+#, c-format
+msgid ""
+"Unable to connect to POP server.\n"
+"Error sending password: %s"
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:17
-msgid "label9"
-msgstr "yafta9"
+#: camel/providers/pop3/camel-pop3-store.c:555
+#, c-format
+msgid "No such folder `%s'."
+msgstr ""
 
-#: composer/e-msg-composer-address-dialog.glade.h:18
-msgid "label7"
-msgstr "yafta7"
+#: camel/providers/sendmail/camel-sendmail-provider.c:34
+#, fuzzy
+msgid "Sendmail"
+msgstr "GЖnder"
 
-#: composer/e-msg-composer-address-dialog.glade.h:19
-msgid "label8"
-msgstr "yafta8"
+#: camel/providers/sendmail/camel-sendmail-provider.c:36
+msgid ""
+"For delivering mail by passing it to the \"sendmail\" program on the local "
+"system."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:105
+#, c-format
+msgid "Could not create pipe to sendmail: %s: mail not sent"
+msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:76
+#: camel/providers/sendmail/camel-sendmail-transport.c:122
+#, c-format
+msgid "Could not fork sendmail: %s: mail not sent"
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:148
+#, fuzzy, c-format
+msgid "Could not send message: %s"
+msgstr "Bir ileti yaz"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:161
+#, c-format
+msgid "sendmail exited with signal %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:168
+#, c-format
+msgid "Could not execute %s: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:173
+#, c-format
+msgid "sendmail exited with status %d: mail not sent."
+msgstr ""
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:220
+#, fuzzy
+msgid "sendmail"
+msgstr "ePosta'yЩ al"
+
+#: camel/providers/sendmail/camel-sendmail-transport.c:222
+msgid "Mail delivery via the sendmail program"
+msgstr ""
+
+#: camel/providers/smtp/camel-smtp-provider.c:36
+msgid "For delivering mail by connecting to a remote mailhub using SMTP."
+msgstr ""
+
+#: camel/providers/vee/camel-vee-provider.c:30
+#, fuzzy
+msgid "Virtual folder email provider"
+msgstr "_Sanal Dizin SihirbazЩ ..."
+
+#: camel/providers/vee/camel-vee-provider.c:32
+msgid "For reading mail as a query of another set of folders"
+msgstr ""
+
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:78
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1f bin bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:89
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1f milyon bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:93
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1f milyar bayt"
 
-#: composer/e-msg-composer-attachment-bar.c:299
-msgid "Add attachment"
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#, fuzzy
+msgid "attachment"
 msgstr "Eklem ekle"
 
-#: composer/e-msg-composer-attachment-bar.c:362 shell/e-shortcuts-view.c:333
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/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
+#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
 msgid "Remove"
 msgstr "Sil"
 
-#: composer/e-msg-composer-attachment-bar.c:363
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "SeГili birimleri eklemler listesinden sil"
 
-#: composer/e-msg-composer-attachment-bar.c:394
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Eklem ekle ..."
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 msgstr "Iletiyi bir dosya ekle"
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Eklem Жzellikleri"
 
-#: composer/e-msg-composer-attachment.glade.h:8
+#: po/tmp/e-msg-composer-attachment.glade.h:8
+msgid "File name:"
+msgstr "Dosya adЩ :"
+
+#: po/tmp/e-msg-composer-attachment.glade.h:9
 msgid "MIME type:"
 msgstr "MIME tЭrЭ :"
 
-#: composer/e-msg-composer-attachment.glade.h:10
-msgid "File name:"
-msgstr "Dosya adЩ :"
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
+#: mail/mail-format.c:621
+#, fuzzy
+msgid "From:"
+msgstr "GЖnderen"
 
-#: composer/e-msg-composer-hdrs.c:174
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Adres defteri iГin buraya tЩkla"
 
-#: composer/e-msg-composer-hdrs.c:216
+#: composer/e-msg-composer-hdrs.c:291
+#, 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
 msgid "To:"
 msgstr "Gn:"
 
-#: composer/e-msg-composer-hdrs.c:217
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Iletinin gЖnderildiПi kiЧiler"
 
-#: composer/e-msg-composer-hdrs.c:221
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:222
+#: composer/e-msg-composer-hdrs.c:301
 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:227
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:228
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -2342,53 +3507,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:234
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Konu :"
 
-#: composer/e-msg-composer-hdrs.c:235
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Iletinin konusunu ver"
 
-#: composer/e-msg-composer.c:444
+#: composer/e-msg-composer.c:429
+#, c-format
+msgid ""
+"Could not open signature file %s:\n"
+"%s"
+msgstr ""
+
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "FarklЩ kaydet ..."
 
-#: composer/e-msg-composer.c:455
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "`%s' dosyasЩnЩ kaydederken hata oldu"
 
-#: composer/e-msg-composer.c:475
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
 
-#: composer/e-msg-composer.c:494
-msgid "Discard this message?"
-msgstr "Bu iletiyi unutalЩm mЩ ?"
+#: composer/e-msg-composer.c:652
+#, fuzzy
+msgid "Saving changes to message..."
+msgstr "Iletiyi kaydet"
+
+#: composer/e-msg-composer.c:654
+#, fuzzy
+msgid "Save changes to message..."
+msgstr "Iletiyi kaydet"
+
+#: composer/e-msg-composer.c:695
+#, c-format
+msgid "Error saving composition to 'Drafts': %s"
+msgstr ""
+
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+msgid "Evolution"
+msgstr "Evolution"
+
+#: composer/e-msg-composer.c:745
+msgid ""
+"This message has not been sent.\n"
+"\n"
+"Do you wish to save your changes?"
+msgstr ""
 
-#: composer/e-msg-composer.c:511
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "DosyayЩ aГ"
 
-#: composer/e-msg-composer.c:623
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "BЖyle bir dosya yok ."
 
-#: composer/e-msg-composer.c:633
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Bu normal bir dosya deПildir ."
 
-#: composer/e-msg-composer.c:643
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr "Bu dosya vardЩr ama okunabilir deПil ."
 
-#: composer/e-msg-composer.c:653
+#: composer/e-msg-composer.c:923
 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:675
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -2396,208 +3590,767 @@ 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:696
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "DosyayЩ okurken bir hata oldu ."
 
-#: composer/e-msg-composer.c:792 shell/e-shell-view-menu.c:433
-msgid "_File"
-msgstr "_Dosya"
+#: composer/e-msg-composer.c:1343
+msgid "Compose a message"
+msgstr "Bir ileti yaz"
 
-#: composer/e-msg-composer.c:798
-msgid "_Open..."
-msgstr "_AГ ..."
+#: composer/e-msg-composer.c:1420
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: composer/e-msg-composer.c:799
-msgid "Load a previously saved message"
-msgstr "жnceden kaydedilmiЧ iletiyi yЭkle"
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
 
-#: composer/e-msg-composer.c:807
-msgid "_Save..."
-msgstr "_FarklЩ kaydet ..."
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Ara ..."
 
-#: composer/e-msg-composer.c:808
-msgid "Save message"
-msgstr "Iletiyi kaydet"
+#: filter/filter-datespec.c:62
+#, fuzzy
+msgid "years"
+msgstr "yЩl"
 
-#: composer/e-msg-composer.c:816
-msgid "_Save as..."
-msgstr "_FarklЩ kaydet ..."
+#: filter/filter-datespec.c:63
+#, fuzzy
+msgid "months"
+msgstr "ay"
 
-#: composer/e-msg-composer.c:817
-msgid "Save message with a different name"
-msgstr "Iletiyi faklЩ bir isim altЩnda kaydet"
+#: filter/filter-datespec.c:64
+#, fuzzy
+msgid "weeks"
+msgstr "hafta"
 
-#: composer/e-msg-composer.c:825
-msgid "Save in _folder..."
-msgstr "_Dizinde kaydet ..."
+#: filter/filter-datespec.c:65
+#, fuzzy
+msgid "days"
+msgstr "gЭn"
 
-#: composer/e-msg-composer.c:826
-msgid "Save the message in a specified folder"
-msgstr "Iletiyi belirlenen dizinde kaydet"
+#: filter/filter-datespec.c:66
+#, fuzzy
+msgid "hours"
+msgstr "saat"
 
-#: composer/e-msg-composer.c:835
-msgid "_Insert text file... (FIXME)"
-msgstr "_Metin dosyasЩnЩ iГer ... ( ABY )"
+#: filter/filter-datespec.c:67
+#, fuzzy
+msgid "minutes"
+msgstr "dakika"
 
-#: composer/e-msg-composer.c:836
-msgid "Insert a file as text into the message"
-msgstr "Bir dosyayЩ metin olarak ekle"
+#: filter/filter-datespec.c:68
+#, fuzzy
+msgid "seconds"
+msgstr " saniye"
 
-#: composer/e-msg-composer.c:845
-msgid "_Send"
-msgstr "_GЖnder"
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
 
-#: composer/e-msg-composer.c:846
-msgid "Send the message"
-msgstr "Iletiyi gЖnder"
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
 
-#: composer/e-msg-composer.c:856
-msgid "_Close..."
-msgstr "_Kapat"
+#: filter/filter-datespec.c:259
+msgid ""
+"The message's date will be compared against\n"
+"whatever the time is when the filter is run\n"
+"or vfolder is opened."
+msgstr ""
 
-#: composer/e-msg-composer.c:857
-msgid "Quit the message composer"
-msgstr "Ileti tasarЩlayЩcЩsЩndan ГЩk"
+#: filter/filter-datespec.c:282
+msgid ""
+"The message's date will be compared against\n"
+"the time that you specify here."
+msgstr ""
 
-#: composer/e-msg-composer.c:870 shell/e-shell-view-menu.c:475
-msgid "_Edit"
+#: filter/filter-datespec.c:322
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when the filter is run;\n"
+"\"a week ago\", for example."
+msgstr ""
+
+#. keep in sync with FilterDatespec_type!
+#: filter/filter-datespec.c:357
+#, fuzzy
+msgid "the current time"
+msgstr "чimdiki zamana git"
+
+#: filter/filter-datespec.c:357
+msgid "a time you specify"
+msgstr ""
+
+#: filter/filter-datespec.c:358
+msgid "a time relative to the current time"
+msgstr ""
+
+#. The label
+#: filter/filter-datespec.c:416
+msgid "Compare against"
+msgstr ""
+
+#: filter/filter-datespec.c:690
+#, fuzzy
+msgid "<click here to select a date>"
+msgstr "* Bir tanЩПЩ eklemek iГin buraya tЩkla *"
+
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
+#, fuzzy
+msgid "Add Filter Rule"
+msgstr "Filtralarla oyna"
+
+#: filter/filter-editor.c:233
+#, fuzzy
+msgid "Edit Filter Rule"
+msgstr "Filtralarla oyna"
+
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+#, fuzzy
+msgid "outgoing"
+msgstr "Kitle"
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
+#, fuzzy
+msgid "Edit Filters"
+msgstr "Filtralarla oyna"
+
+#. and now for the action area
+#: filter/filter-filter.c:401
+#, fuzzy
+msgid "Then"
+msgstr "PerЧ."
+
+#: filter/filter-filter.c:414
+#, fuzzy
+msgid "Add action"
+msgstr "E_ylemler"
+
+#: filter/filter-filter.c:420
+#, fuzzy
+msgid "Remove action"
+msgstr "Sil"
+
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
+#, fuzzy
+msgid "Select Folder"
+msgstr "_Dizin"
+
+#: filter/filter-folder.c:243
+msgid "Enter folder URI"
+msgstr ""
+
+#: filter/filter-folder.c:289
+msgid "<click here to select a folder>"
+msgstr ""
+
+#: filter/filter-input.c:184
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
+msgid "Test"
+msgstr ""
+
+#: filter/filter-rule.c:520
+#, fuzzy
+msgid "Rule name: "
+msgstr "Dosya adЩ :"
+
+#: filter/filter-rule.c:524
+#, fuzzy
+msgid "Untitled"
+msgstr "( Isimsiz )"
+
+#: filter/filter-rule.c:540
+#, fuzzy
+msgid "If"
+msgstr "f"
+
+#: filter/filter-rule.c:557
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:561
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:566
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:577
+msgid "Add criterion"
+msgstr ""
+
+#: filter/filter-rule.c:583
+msgid "Remove criterion"
+msgstr ""
+
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
+#, fuzzy
+msgid "Edit"
 msgstr "_DeПiЧtir"
 
-#: composer/e-msg-composer.c:881
-msgid "_Format"
-msgstr "чe_kil"
+#: po/tmp/filter.glade.h:10
+#, fuzzy
+msgid "Edit VFolders"
+msgstr "Filtralarla oyna"
 
-#: composer/e-msg-composer.c:887
-msgid "HTML"
-msgstr "HTML"
+#: po/tmp/filter.glade.h:11
+#, fuzzy
+msgid "Filter Rules"
+msgstr "Filtra"
 
-#: composer/e-msg-composer.c:888
-msgid "Send the mail in HTML format"
-msgstr "ePostayЩ HTML Чeklinde gЖnder"
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
 
-#: composer/e-msg-composer.c:901 shell/e-shell-view-menu.c:382
-#: shell/e-shell-view-menu.c:486
-msgid "_View"
-msgstr "_GЖster"
+#: po/tmp/filter.glade.h:13
+#, fuzzy
+msgid "Outgoing"
+msgstr "DЩЧlЩm :"
 
-#: composer/e-msg-composer.c:907
-msgid "Show _attachments"
-msgstr "_Eklemleri gЖster"
+#: po/tmp/filter.glade.h:15
+#, fuzzy
+msgid "Virtual Folders"
+msgstr "_Sanal Dizin SihirbazЩ ..."
 
-#: composer/e-msg-composer.c:908
-msgid "Show/hide attachments"
-msgstr "Eklemleri gЖster/gizle"
+#: po/tmp/filter.glade.h:16
+#, fuzzy
+msgid "vFolder Sources"
+msgstr "Kaynak ekle"
 
-#: composer/e-msg-composer.c:941
-msgid "Send"
+#. Automatically generated. Do not edit.
+#: filter/libfilter-i18n.h:2
+msgid "Assign Colour"
+msgstr ""
+
+#: filter/libfilter-i18n.h:3
+msgid "Assign Score"
+msgstr ""
+
+#: filter/libfilter-i18n.h:4
+#, fuzzy
+msgid "Copy to Folder"
+msgstr "ABY : Dizine _kopyala ..."
+
+#: filter/libfilter-i18n.h:5
+#, fuzzy
+msgid "Date received"
+msgstr "AlЩndЩ"
+
+#: filter/libfilter-i18n.h:6
+#, 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"
+
+#: filter/libfilter-i18n.h:12
+msgid "Message was received"
+msgstr ""
+
+#: filter/libfilter-i18n.h:13
+#, fuzzy
+msgid "Message was sent"
+msgstr "_Yekin iletilei gЖrЭnmЭЧ olarak iЧaretle"
+
+#: filter/libfilter-i18n.h:14
+#, fuzzy
+msgid "Move to Folder"
+msgstr "ABY : Dizine _taЧЩ ..."
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "Recipients"
+msgstr "AlЩcЩlar listesi :"
+
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
+#, fuzzy
+msgid "Sender"
 msgstr "GЖnder"
 
-#: composer/e-msg-composer.c:942
-msgid "Send this message"
-msgstr "Bu iletiyi gЖnder"
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "BaПlЩ olma durumu"
 
-#: composer/e-msg-composer.c:951
-msgid "Attach"
-msgstr "Ekle"
+#: filter/libfilter-i18n.h:20
+#, fuzzy
+msgid "Source"
+msgstr "Kaynak ekle"
 
-#: composer/e-msg-composer.c:952
-msgid "Attach a file"
-msgstr "Bir dosya ekle"
+#: filter/libfilter-i18n.h:21
+msgid "Specific header"
+msgstr ""
 
-#: composer/e-msg-composer.c:1139
-msgid "Compose a message"
-msgstr "Bir ileti yaz"
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "C.t"
+
+#: filter/libfilter-i18n.h:23
+msgid "Stop Processing"
+msgstr ""
+
+#: filter/libfilter-i18n.h:24
+msgid "Subject"
+msgstr "Konu"
+
+#: filter/libfilter-i18n.h:25
+#, fuzzy
+msgid "after"
+msgstr "Tarih"
+
+#: filter/libfilter-i18n.h:26
+msgid "before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:27
+#, fuzzy
+msgid "contains"
+msgstr "E_ylemler"
+
+#: filter/libfilter-i18n.h:28
+msgid "does not contain"
+msgstr ""
+
+#: 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 ."
+
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "does not sound like"
+msgstr "Dosya bulunamadЩ"
+
+#: filter/libfilter-i18n.h:32
+msgid "does not start with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "exists"
+msgstr "Ileri"
+
+#: filter/libfilter-i18n.h:35
+msgid "is greater than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:36
+msgid "is less than"
+msgstr ""
+
+#: filter/libfilter-i18n.h:37
+msgid "is not"
+msgstr ""
+
+#: filter/libfilter-i18n.h:38
+#, fuzzy
+msgid "is"
+msgstr "i"
+
+#: filter/libfilter-i18n.h:39
+#, fuzzy
+msgid "on or after"
+msgstr "Tarihe git"
+
+#: filter/libfilter-i18n.h:40
+msgid "on or before"
+msgstr ""
+
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
+msgid "was after"
+msgstr ""
+
+#: filter/libfilter-i18n.h:44
+msgid "was before"
+msgstr ""
+
+#: filter/score-editor.c:127
+#, fuzzy
+msgid "Add Rule"
+msgstr "Kaynak ekle"
+
+#: filter/score-editor.c:166
+#, fuzzy
+msgid "Edit Score Rule"
+msgstr "KaynaПЩ deПiЧtir"
+
+#: filter/score-rule.c:192 filter/score-rule.c:194
+#, fuzzy
+msgid "Score"
+msgstr "SЩrala"
+
+#: filter/vfolder-editor.c:155
+msgid "Add VFolder Rule"
+msgstr ""
 
-#: mail/component-factory.c:208
+#: filter/vfolder-editor.c:204
+#, fuzzy
+msgid "Edit VFolder Rule"
+msgstr "Filtralarla oyna"
+
+#: mail/component-factory.c:227
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Evolution'in ePosta parГasЩnЩ baЧlatamadЩm ."
 
-#: mail/folder-browser-factory.c:23
-msgid "Get mail"
-msgstr "ePosta'yЩ al"
+#: mail/component-factory.c:266
+msgid "Cannot register storage with shell"
+msgstr ""
 
-#: mail/folder-browser-factory.c:23
-msgid "Check for new mail"
-msgstr "Yeni ePosta iГin bak"
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+#, fuzzy
+msgid "Save"
+msgstr "C.tesi"
 
-#: mail/folder-browser-factory.c:24
-msgid "Compose"
-msgstr "Yaz"
+#: mail/folder-browser.c:153
+msgid "Body or subject contains"
+msgstr ""
 
-#: mail/folder-browser-factory.c:24
-msgid "Compose a new message"
-msgstr "Yeni bir ePosta iletisini yaz"
+#: mail/folder-browser.c:154
+msgid "Body contains"
+msgstr ""
 
-#: mail/folder-browser-factory.c:28
-msgid "Reply"
-msgstr "Cevapla"
+#: mail/folder-browser.c:155
+#, fuzzy
+msgid "Subject contains"
+msgstr "Konu"
 
-#: mail/folder-browser-factory.c:28
-msgid "Reply to the sender of this message"
-msgstr "Iletiyi gЖnderene cevap ver"
+#: mail/folder-browser.c:156
+msgid "Body does not contain"
+msgstr ""
 
-#: mail/folder-browser-factory.c:29
-msgid "Reply to All"
+#: mail/folder-browser.c:157
+msgid "Subject does not contain"
+msgstr ""
+
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
+msgstr ""
+
+#: mail/folder-browser.c:455
+msgid "VFolder on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:458
+#, fuzzy
+msgid "Filter on Sender"
+msgstr "Dosya bulunamadЩ"
+
+#: mail/folder-browser.c:459
+msgid "Filter on Recipients"
+msgstr ""
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "_AГ ..."
+
+#: mail/folder-browser.c:466
+#, 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
+msgid "Print"
+msgstr "YazdЩr"
+
+#: mail/folder-browser.c:469
+#, fuzzy
+msgid "Reply to Sender"
 msgstr "Hepsine cevapla"
 
-#: mail/folder-browser-factory.c:29
-msgid "Reply to all recipients of this message"
-msgstr "Iletinin yekin alЩcЩlarЩna cevap ver"
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
+msgid "Reply to All"
+msgstr "Hepsine cevapla"
 
-#: mail/folder-browser-factory.c:31
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Ilet"
 
-#: mail/folder-browser-factory.c:31
-msgid "Forward this message"
-msgstr "Bu iletiyi ilet"
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Zamanda ileri git"
 
-#: mail/folder-browser-factory.c:35
-msgid "Move"
-msgstr "TaЧЩ"
+#: mail/folder-browser.c:474
+#, fuzzy
+msgid "Mark as Read"
+msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
 
-#: mail/folder-browser-factory.c:35
-msgid "Move message to a new folder"
-msgstr "Iletiyi yeni bir dizine taЧЩ"
+#: mail/folder-browser.c:475
+#, fuzzy
+msgid "Mark as Unread"
+msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
 
-#: mail/folder-browser-factory.c:37
-msgid "Print the selected message"
-msgstr "SeГili iletiyi yazdЩr"
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Dizinde git ..."
 
-#: mail/folder-browser-factory.c:39
-msgid "Delete this message"
-msgstr "Bu iletiyi sil"
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Dizinde git ..."
 
-#: mail/folder-browser-factory.c:60
-msgid "_Threaded Message List"
-msgstr "Iletilerin k_onu listesi"
+#: mail/folder-browser.c:480
+#, fuzzy
+msgid "Undelete"
+msgstr "Sil"
 
-#: mail/folder-browser-factory.c:73
-msgid "_Mark all messages seen"
-msgstr "_Yekin iletilei gЖrЭnmЭЧ olarak iЧaretle"
+#. { _("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
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Filtra"
 
-#: mail/folder-browser-factory.c:79
-msgid "_Expunge"
-msgstr "_Temizle"
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
 
-#: mail/folder-browser-factory.c:85
-msgid "Mail _Filters ..."
-msgstr "ePosta _filtralarЩ ..."
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
 
-#: mail/folder-browser-factory.c:91
-msgid "_vFolder Editor ..."
-msgstr "_sanal klasЖrler editЖrЭ ..."
+#: mail/mail-autofilter.c:71
+#, c-format
+msgid "Mail to %s"
+msgstr ""
 
-#: mail/folder-browser-factory.c:97
-msgid "_Mail Configuration ..."
-msgstr "_ePosta ayarlarЩ ..."
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Konu"
 
-#: mail/folder-browser-factory.c:103
-msgid "Forget _Passwords"
-msgstr "_ParolalarЩ unut"
+#: mail/mail-autofilter.c:230
+#, c-format
+msgid "Mail from %s"
+msgstr ""
+
+#: mail/mail-autofilter.c:331
+#, c-format
+msgid "%s mailing list"
+msgstr ""
+
+#: mail/mail-callbacks.c:74
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+
+#: mail/mail-callbacks.c:114
+#, fuzzy
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"ePosta gЖndermeden Жnce bir ePosta\n"
+"hesabЩnЩ ayarlaman lazЩm."
+
+#: mail/mail-callbacks.c:128
+#, fuzzy
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"ePosta gЖndermeden Жnce bir ePosta\n"
+"hesabЩnЩ ayarlaman lazЩm."
+
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
+msgid "You have no mail sources configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:213
+msgid "You have not set a mail transport method"
+msgstr ""
+
+#: mail/mail-callbacks.c:222
+msgid "You have no Outbox configured"
+msgstr ""
+
+#: mail/mail-callbacks.c:246
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Bu iletinin konusu yok .\n"
+"Vallahi mi gЖndereyim ?"
+
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
+msgid "Move message(s) to"
+msgstr "Ileti(leri) buraya taЧЩ "
+
+#: mail/mail-callbacks.c:554
+#, fuzzy
+msgid "Copy message(s) to"
+msgstr "Ileti(leri) buraya taЧЩ "
+
+#: mail/mail-callbacks.c:665
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr ""
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#, 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
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Iletiyi kaydet"
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Iletiyi kaydet"
+
+#: mail/mail-callbacks.c:877
+#, fuzzy, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr "`%s' dosyasЩnЩ yЭklerken hata oldu"
+
+#: mail/mail-callbacks.c:922
+#, fuzzy
+msgid "Print Message"
+msgstr "Iletiyi gЖnder"
+
+#: mail/mail-callbacks.c:969
+msgid "Printing of message failed"
+msgstr ""
+
+#.
+#. * 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
+msgid "Identity"
+msgstr "Kimlik"
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr "ePosta ayarlamasЩ"
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr "ePosta kaynaПЩ"
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr "ePosta transferi"
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
 
-#: mail/mail-config.c:707
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
@@ -2607,51 +4360,65 @@ msgstr ""
 "istersen Эye oldudun ЖrgЭtЭn adЩnЩ ve imza dosyasЩ olarak kullanЩlacak "
 "dosyanЩn adЩnЩ belirtebilirsin."
 
-#: mail/mail-config.c:720
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Tam ismi :"
 
-#: mail/mail-config.c:744
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "ePosta adresi : "
 
-#: mail/mail-config.c:759
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "жrgЭt : "
 
-#: mail/mail-config.c:770
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Imza dosyasЩ : "
 
-#: mail/mail-config.c:775
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Imza DosyasЩ"
 
-#: mail/mail-config.c:1188
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Sunucu :"
 
-#: mail/mail-config.c:1194
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "KullanЩcЩ adЩ :"
 
-#: mail/mail-config.c:1200
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Dizin :"
 
-#: mail/mail-config.c:1208
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "DoПrulama :"
 
-#: mail/mail-config.c:1220
+#: mail/mail-config-gui.c:956
 msgid "Detect supported types..."
 msgstr "Desteklenen tЭrleri dene ..."
 
-#: mail/mail-config.c:1243
+#: 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"
+msgstr "Ileti tasarЩlayЩcЩsЩndan ГЩk"
+
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr "AyarlarЩ dene"
 
-#: mail/mail-config.c:1365 mail/mail-config.c:1413
+#: mail/mail-config-gui.c:1130
+#, fuzzy
+msgid "Mail source type:"
+msgstr "ePosta kaynaПЩ"
+
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -2664,7 +4431,12 @@ msgstr ""
 "Sunucu bir tanЩmlama bekliyorsa o zaman \"Desteklenen tЭrleri dene ...\" "
 "basmasЩna ЖbЭr bilgiler verdikten sonra basabilirsin ."
 
-#: mail/mail-config.c:1389
+#: mail/mail-config-gui.c:1154
+#, fuzzy
+msgid "News source type:"
+msgstr "Yeni telefon tipi"
+
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -2672,125 +4444,809 @@ msgid ""
 "If the server requires authentication, you can click the \"Detect supported "
 "types...\" button after entering the other information."
 msgstr ""
-"KullanЩlacak haber sunucusunu seГ ve yekin gerekn bilgileri ver"
-"\n"
+"KullanЩlacak haber sunucusunu seГ ve yekin gerekn bilgileri ver\n"
 "\n"
 "Sunucu bir tanЩmlama bekliyorsa o zaman \"Desteklenen tЭrleri dene ...\" "
 "basmasЩna ЖbЭr bilgiler verdikten sonra basabilirsin ."
 
-#: mail/mail-config.c:1455
-msgid "Edit Identity"
-msgstr "KimliПi deПiЧtir"
+#: mail/mail-config-gui.c:1178
+#, fuzzy
+msgid "Mail transport type:"
+msgstr "ePosta transferi"
 
-#: mail/mail-config.c:1457
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr "Kimlik ekle"
 
-#: mail/mail-config.c:1537
-msgid "Edit Source"
-msgstr "KaynaПЩ deПiЧtir"
+#: mail/mail-config-gui.c:1235
+msgid "Edit Identity"
+msgstr "KimliПi deПiЧtir"
 
-#: mail/mail-config.c:1539
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Kaynak ekle"
 
-#: mail/mail-config.c:1622
+#: mail/mail-config-gui.c:1335
+msgid "Edit Source"
+msgstr "KaynaПЩ deПiЧtir"
+
+#: mail/mail-config-gui.c:1430
+msgid "Add News Server"
+msgstr "Haber suncusu ekle"
+
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Haber sunucusuyla oyna"
 
-#: mail/mail-config.c:1624
-msgid "Add News Server"
+#: mail/mail-config-gui.c:2253
+#, fuzzy, c-format
+msgid "Testing \"%s\""
+msgstr "AyarlarЩ dene"
+
+#: mail/mail-config-gui.c:2255
+#, c-format
+msgid "Test connection to \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2296
+msgid "The connection was successful!"
+msgstr ""
+
+#: mail/mail-config-gui.c:2346
+#, c-format
+msgid "Querying authorization capabilities of \"%s\""
+msgstr ""
+
+#: mail/mail-config-gui.c:2348
+#, c-format
+msgid "Query authorization at \"%s\""
+msgstr ""
+
+#: po/tmp/mail-config.glade.h:7
+msgid "Address"
+msgstr "Adres"
+
+#: po/tmp/mail-config.glade.h:10
+#, fuzzy
+msgid "Identities"
+msgstr "Kimlik"
+
+#: po/tmp/mail-config.glade.h:11
+#, fuzzy
+msgid "Mail Sources"
+msgstr "ePosta kaynaПЩ"
+
+#: po/tmp/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
+#, fuzzy
+msgid "News Servers"
 msgstr "Haber suncusu ekle"
 
-#: mail/mail-ops.c:393
-msgid "Fetching mail"
-msgstr "ePosta'yЩ alЩyorum"
+#: po/tmp/mail-config.glade.h:15
+#, fuzzy
+msgid "News Sources"
+msgstr "Kaynak ekle"
+
+#: po/tmp/mail-config.glade.h:16
+#, fuzzy
+msgid "Organization"
+msgstr "жrgЭt : "
+
+#: po/tmp/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
+msgid "Please enter your PGP/GPG passphrase."
+msgstr ""
 
-#: mail/mail-ops.c:405
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+msgid "No password provided."
+msgstr ""
+
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#, c-format
+msgid "Couldn't create pipe to GPG/PGP: %s"
+msgstr ""
+
+#: mail/mail-crypto.c:625
+msgid "No GPG/PGP program available."
+msgstr ""
+
+#: mail/mail-display.c:90
+#, c-format
 msgid ""
-"This message has no subject.\n"
-"Really send?"
+"Could not open file %s:\n"
+"%s"
 msgstr ""
-"Bu iletinin konusu yok .\n"
-"Vallahi mi gЖndereyim ?"
 
-#: mail/mail-ops.c:525
+#: mail/mail-display.c:113
+#, fuzzy, c-format
+msgid "Could not write data: %s"
+msgstr "Diyalog kutusunu yaratamadЩm ."
+
+#: mail/mail-display.c:218
+#, fuzzy
+msgid "Save Attachment"
+msgstr "ABY : Eklem _ekle ..."
+
+#: mail/mail-display.c:258
+#, fuzzy, c-format
+msgid "Could not create temporary directory: %s"
+msgstr ""
+"%s dizinini yaratamadЩm\n"
+"\n"
+"Hata : %s"
+
+#: mail/mail-display.c:300
+#, fuzzy
+msgid "Save to Disk..."
+msgstr "FarklЩ kaydet ..."
+
+#: mail/mail-display.c:302
+#, fuzzy, c-format
+msgid "Open in %s..."
+msgstr "_AГ ..."
+
+#: mail/mail-display.c:304
+msgid "View Inline"
+msgstr ""
+
+#: mail/mail-display.c:328
+msgid "External Viewer"
+msgstr ""
+
+#: mail/mail-display.c:351
+#, c-format
+msgid "View Inline (via %s)"
+msgstr ""
+
+#: mail/mail-display.c:355
+#, fuzzy
+msgid "Hide"
+msgstr "BaЧlЩk"
+
+#: mail/mail-format.c:500
+#, 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
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+#, fuzzy
+msgid "Encrypted message not displayed"
+msgstr "Konu dizimini ayЩrtЩrken bir ileti bozuk mu cЩktЩ ?"
+
+#: mail/mail-format.c:863
+#, fuzzy
+msgid "Encrypted message"
+msgstr "Iletiyi gЖnder"
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1486
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
+#, c-format
+msgid "Changing folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:206
+#, c-format
+msgid "Change folder \"%s\" to \"%s\" format"
+msgstr ""
+
+#: mail/mail-local.c:261
+msgid "Closing current folder"
+msgstr ""
+
+#: mail/mail-local.c:293
+msgid "Renaming old folder and opening"
+msgstr ""
+
+#: mail/mail-local.c:314
+#, fuzzy
+msgid "Creating new folder"
+msgstr "Yeni bir dizini yarat"
+
+#: mail/mail-local.c:329
+#, fuzzy
+msgid "Copying messages"
+msgstr "Bir ileti yaz"
+
+#: mail/mail-local.c:341
+#, c-format
 msgid ""
-"You need to configure an identity\n"
-"before you can send mail."
+"Cannot save folder metainfo; you'll probably find you can't\n"
+"open this folder anymore: %s"
 msgstr ""
-"ePosta gЖndermeden Жnce bir ePosta\n"
-"hesabЩnЩ ayarlaman lazЩm."
 
-#: mail/mail-ops.c:801
-msgid "Move message(s) to"
+#: mail/mail-local.c:372
+msgid ""
+"If you can no longer open this mailbox, then\n"
+"you may need to repair it manually."
+msgstr ""
+
+#: mail/mail-local.c:781
+msgid "Registering local folder"
+msgstr ""
+
+#: mail/mail-local.c:783
+#, fuzzy
+msgid "Register local folder"
+msgstr "Yeni bir dizini yarat"
+
+#: mail/mail-ops.c:79
+#, fuzzy, c-format
+msgid "Fetching email from %s"
+msgstr "ePosta'yЩ alЩyorum"
+
+#: mail/mail-ops.c:81
+#, fuzzy, c-format
+msgid "Fetch email from %s"
+msgstr "ePosta'yЩ alЩyorum"
+
+#: mail/mail-ops.c:331
+#, c-format
+msgid "There is no new mail at %s."
+msgstr ""
+
+#: mail/mail-ops.c:401
+msgid "Filtering email on demand"
+msgstr ""
+
+#: mail/mail-ops.c:403
+msgid "Filter email on demand"
+msgstr ""
+
+#: mail/mail-ops.c:538
+#, 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
+#, fuzzy
+msgid "Send a message without a subject"
+msgstr "Iletiyi faklЩ bir isim altЩnda kaydet"
+
+#: mail/mail-ops.c:720
+msgid "Sending queue"
+msgstr ""
+
+#: mail/mail-ops.c:722
+msgid "Send queue"
+msgstr ""
+
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
+#, c-format
+msgid "Appending \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
+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
+#, c-format
+msgid "Moving messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1003
+#, c-format
+msgid "Copying messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1006
+#, fuzzy, c-format
+msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Ileti(leri) buraya taЧЩ "
 
-#: mail/mail-threads.c:483
-msgid "Currently pending operations:"
-msgstr "чu an geГerli olan eylemler :"
+#: mail/mail-ops.c:1008
+#, c-format
+msgid "Copy messages from \"%s\" into \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:1039
+#, fuzzy
+msgid "Moving"
+msgstr "P.t"
+
+#: mail/mail-ops.c:1042
+#, fuzzy
+msgid "Copying"
+msgstr "Kopyala"
+
+#: mail/mail-ops.c:1062
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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."
+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 "Zaman gЖsterimi"
+
+#: mail/mail-ops.c:2021
+#, c-format
+msgid "Display message UID \"%s\""
+msgstr ""
+
+#: mail/mail-ops.c:2024
+#, 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 ""
+
+#: 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:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Iletiyi yeni bir dizine taЧЩ"
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Iletiyi yeni bir dizine taЧЩ"
+
+#: mail/mail-ops.c:2474
+#, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr ""
+
+#: mail/mail-search-dialogue.c:104
+msgid "Cancel"
+msgstr "Iptal"
 
-#: mail/mail-threads.c:621
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
 msgid "Incomplete message written on pipe!"
 msgstr "TЭnellemeden bozuk bir ileti geldi !"
 
-#: mail/mail-threads.c:623
+#: mail/mail-threads.c:301
+#, c-format
+msgid ""
+"Error while preparing to %s:\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:675
+#, c-format
+msgid ""
+"Error while `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr "Konu dizimini komutalarla okurken hata oldu ."
 
-#: mail/mail-threads.c:712
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr "Konu dizimini ayЩrtЩrken bir ileti bozuk mu cЩktЩ ?"
 
-#: mail/mail-threads.c:814
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr "Diyalog kutusunu yaratamadЩm ."
 
-#: mail/mail-threads.c:849
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr "SorgulamayЩ kullanЩcЩ durdurdu ."
 
-#: mail/message-list.c:456
-msgid "Online Status"
-msgstr "BaПlЩ olma durumu"
+#: mail/mail-tools.c:189
+#, c-format
+msgid "Couldn't create temporary mbox `%s': %s"
+msgstr ""
 
-#: mail/message-list.c:492
-msgid "From"
-msgstr "GЖnderen"
+#. Get all uids of source
+#: mail/mail-tools.c:239
+#, c-format
+msgid "Examining %s"
+msgstr ""
 
-#: mail/message-list.c:499
-msgid "Subject"
-msgstr "Konu"
+#: mail/mail-tools.c:269
+#, c-format
+msgid ""
+"Could not read UID cache file \"%s\". You may receive duplicate messages."
+msgstr ""
 
-#: mail/message-list.c:506
-msgid "Date"
-msgstr "Tarih"
+#. Info
+#: mail/mail-tools.c:290
+#, c-format
+msgid "Retrieving message %d of %d"
+msgstr ""
 
-#: mail/message-list.c:513
-msgid "Received"
-msgstr "AlЩndЩ"
+#. Append it to dest
+#: mail/mail-tools.c:303
+#, c-format
+msgid "Writing message %d of %d"
+msgstr ""
 
-#: mail/message-list.c:520
-msgid "To"
-msgstr "Gn:"
+#: mail/mail-tools.c:332
+#, c-format
+msgid "Saving changes to %s"
+msgstr ""
+
+#: mail/mail-tools.c:369
+#, fuzzy, c-format
+msgid "[%s] (forwarded message)"
+msgstr "Bu iletiyi ilet"
+
+#: mail/mail-tools.c:379
+msgid "Fwd: (no subject)"
+msgstr ""
+
+#: mail/mail-tools.c:418
+#, fuzzy, c-format
+msgid "Forwarded message - %s"
+msgstr "Bu iletiyi ilet"
+
+#: mail/mail-tools.c:420
+#, fuzzy
+msgid "Forwarded message (no subject)"
+msgstr "Bu iletiyi ilet"
+
+#: mail/mail-tools.c:523
+#, c-format
+msgid ""
+"Cannot open location `%s':\n"
+"%s"
+msgstr ""
+
+#: mail/mail-vfolder.c:147
+#, fuzzy
+msgid "VFolders"
+msgstr "Dizinler"
+
+#: mail/mail-vfolder.c:296
+#, 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
+msgid "Reply"
+msgstr "Cevapla"
+
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+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
+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
+msgid "Forward this message"
+msgstr "Bu iletiyi ilet"
+
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+msgid "Print the selected message"
+msgstr "SeГili iletiyi yazdЩr"
+
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
+msgid "Delete this message"
+msgstr "Bu iletiyi sil"
+
+#: mail/message-list.c:572
+#, fuzzy
+msgid "Unseen"
+msgstr "yedinci"
+
+#: mail/message-list.c:575
+#, fuzzy
+msgid "Seen"
+msgstr "GЖnder"
+
+#: mail/message-list.c:578
+msgid "Answered"
+msgstr ""
+
+#: mail/message-list.c:846
+#, 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
+#, c-format
+msgid "%s, et al."
+msgstr ""
+
+#: mail/message-list.c:860 mail/message-list.c:875
+msgid "<unknown>"
+msgstr ""
+
+#: mail/message-list.c:2068
+msgid "Rebuilding message view"
+msgstr ""
+
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
+msgstr ""
+
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
+msgstr ""
+
+#: mail/subscribe-dialog.c:172
+#, fuzzy, c-format
+msgid "Getting store for \"%s\""
+msgstr "Na_sЩl baЧlarЩm"
+
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:282
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr ""
 
-#: mail/message-list.c:527
-msgid "Size"
-msgstr "Boyut"
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr ""
+
+#: mail/subscribe-dialog.c:290
+#, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr ""
 
-#: shell/e-setup.c:47
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
+msgstr ""
+
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "Evolution yЭklenmesi"
 
-#: shell/e-setup.c:51
+#: shell/e-setup.c:116
+msgid ""
+"This new version of Evolution needs to install additional files\n"
+"into your personal Evolution directory"
+msgstr ""
+
+#: shell/e-setup.c:117
+#, fuzzy
+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
+#, fuzzy
+msgid "Could not update files correctly"
+msgstr "Diyalog kutusunu yaratamadЩm ."
+
+#: shell/e-setup.c:158 shell/e-setup.c:224
+msgid "Evolution files successfully installed."
+msgstr "Evolution dosyalarЩ baЧarЩlЩ yЭklendi."
+
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr "Bu Evolution'i ilk ГalЩЧtЩrmana benziyor ."
 
-#: shell/e-setup.c:52
+#: shell/e-setup.c:188
 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:69
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -2801,7 +5257,7 @@ msgstr ""
 "\n"
 "Hata : %s"
 
-#: shell/e-setup.c:84
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
@@ -2810,22 +5266,29 @@ msgstr ""
 "DosyalarЩ `%s''ye\n"
 "kopyalayamadЩm ."
 
-#: shell/e-setup.c:88
-msgid "Evolution files successfully installed."
-msgstr "Evolution dosyalarЩ baЧarЩlЩ yЭklendi."
-
-#: shell/e-setup.c:108
-#, c-format
+#: shell/e-setup.c:245
+#, fuzzy, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
-"Please remove it in order to allow installation\n"
+"Please move it in order to allow installation\n"
 "of the Evolution user files."
 msgstr ""
 "`%s' bir dizin deПildir.\n"
 "Evolution kullanЩcЩ dosyalarЩnЩn yЭklenmesi\n"
 "iГin o'nu sil."
 
-#: shell/e-shell-folder-creation-dialog.c:81
+#: shell/e-setup.c:257
+#, fuzzy, c-format
+msgid ""
+"The directory `%s' exists but is not the\n"
+"Evolution directory.  Please move it in order\n"
+"to allow installation of the Evolution user files."
+msgstr ""
+"`%s' bir dizin deПildir.\n"
+"Evolution kullanЩcЩ dosyalarЩnЩn yЭklenmesi\n"
+"iГin o'nu sil."
+
+#: shell/e-shell-folder-creation-dialog.c:82
 #, c-format
 msgid ""
 "Cannot create the specified folder:\n"
@@ -2834,11 +5297,11 @@ msgstr ""
 "%s dizinini yaratamadЩm\n"
 " "
 
-#: shell/e-shell-folder-creation-dialog.c:133
+#: shell/e-shell-folder-creation-dialog.c:134
 msgid "The specified folder name is not valid."
 msgstr "Belirtilen dizin adЩ geГerli deПildir ."
 
-#: shell/e-shell-folder-creation-dialog.c:223
+#: shell/e-shell-folder-creation-dialog.c:225
 msgid "Evolution - Create new folder"
 msgstr "Evolution - Yeni dizin yarat"
 
@@ -2850,35 +5313,31 @@ msgstr ""
 "Belirtilen eylem iГin bu seГili klasЖr tipi \n"
 "geГerli deПildir ."
 
-#: shell/e-shell-folder-selection-dialog.c:272
+#: shell/e-shell-folder-selection-dialog.c:291
 msgid "New..."
 msgstr "Yeni ..."
 
-#: shell/e-shell-folder-title-bar.c:459 shell/e-shell-folder-title-bar.c:460
+#: shell/e-shell-folder-title-bar.c:447 shell/e-shell-folder-title-bar.c:448
 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:113
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "Bug-buddy $PATH dizinlenmende bulunamadЩ."
 
 #. same as above
-#: shell/e-shell-view-menu.c:119
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "Bug-buddy ГalЩЧtЩrЩlЩnamadЩ."
 
-#: shell/e-shell-view-menu.c:164
-msgid "Evolution"
-msgstr "Evolution"
-
-#: shell/e-shell-view-menu.c:166
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Tel'if hakkЩ (C) 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:168
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -2888,165 +5347,102 @@ msgstr ""
 "takvim ve tanЩklar yЖnetim uygulamasЩ\n"
 "idir."
 
-#: shell/e-shell-view-menu.c:318
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Dizinde git ..."
 
-#: shell/e-shell-view-menu.c:376
-msgid "_New"
-msgstr "_Yeni"
-
-#: shell/e-shell-view-menu.c:388
-msgid "_Folder"
-msgstr "_Dizin"
-
-#: shell/e-shell-view-menu.c:394
-msgid "Evolution bar _shortcut"
-msgstr "Evolution ГubuПu _kЩsayolu"
-
-#: shell/e-shell-view-menu.c:403
-msgid "_Mail message (FIXME)"
-msgstr "e_Posta iletisi"
-
-#: shell/e-shell-view-menu.c:409
-msgid "_Appointment (FIXME)"
-msgstr "T_oplantЩ"
-
-#: shell/e-shell-view-menu.c:415
-msgid "_Contact (FIXME)"
-msgstr "_TanЩk"
-
-#: shell/e-shell-view-menu.c:421
-msgid "_Task (FIXME)"
-msgstr "_GЖrev"
-
-#: shell/e-shell-view-menu.c:443
-msgid "_Go to folder..."
-msgstr "Dizine _git ..."
-
-#: shell/e-shell-view-menu.c:444
-msgid "Display a different folder"
-msgstr "DeПiЧik bir dizini gЖster"
-
-#: shell/e-shell-view-menu.c:451
-msgid "_Create new folder..."
-msgstr "_Yeni bir dizini yarat ..."
-
-#: shell/e-shell-view-menu.c:452 shell/e-shell-view-menu.c:462
-msgid "Create a new folder"
-msgstr "Yeni bir dizini yarat"
-
-#: shell/e-shell-view-menu.c:461
-msgid "E_xit..."
-msgstr "гЩ_k ..."
-
-#: shell/e-shell-view-menu.c:492
-msgid "Show _shortcut bar"
-msgstr "KЩ_sayol ГubuПunu gЖster"
-
-#: shell/e-shell-view-menu.c:493
-msgid "Show the shortcut bar"
-msgstr "KЩsayol ГubuПunu gЖsterir"
-
-#: shell/e-shell-view-menu.c:498
-msgid "Show _folder bar"
-msgstr "Di_zinler ГubuПunu gЖster"
-
-#: shell/e-shell-view-menu.c:499
-msgid "Show the folder bar"
-msgstr "Dizinler ГubuПunu gЖsterir"
-
-#: shell/e-shell-view-menu.c:521
-msgid "_Actions"
-msgstr "E_ylemler"
-
-#: shell/e-shell-view-menu.c:532
-msgid "_Help"
-msgstr "_Bark"
-
-#: shell/e-shell-view-menu.c:538
-msgid "Help _index"
-msgstr "YardЩm _iГeriПi"
-
-#: shell/e-shell-view-menu.c:545
-msgid "Getting _started"
-msgstr "Na_sЩl baЧlarЩm"
-
-#: shell/e-shell-view-menu.c:552
-msgid "Using the _mailer"
-msgstr "_ePosta bЖlЭmЭnЭ nasЩl kullanЩrЩm"
-
-#: shell/e-shell-view-menu.c:559
-msgid "Using the _calendar"
-msgstr "_Takvimi nasЩl kullanЩrЩm"
-
-#: shell/e-shell-view-menu.c:566
-msgid "Using the c_ontact manager"
-msgstr "Ta_nЩklar yЖneticisini nasЩl kullanЩrЩm"
-
-#: shell/e-shell-view-menu.c:576
-msgid "_Submit bug report"
-msgstr "_Hata raporunu gЖnder"
-
-#: shell/e-shell-view-menu.c:577
-msgid "Submit bug report using Bug Buddy"
-msgstr "bug-buddy desteПiyle bir hata raporunu gЖnder"
-
-#: shell/e-shell-view-menu.c:586
-msgid "_About Evolution..."
-msgstr "_Evolution bilgisi ..."
-
-#: shell/e-shell-view-menu.c:587
-msgid "Show information about Evolution"
-msgstr "Evolution hakkЩnda bilgi gЖster"
-
-#: shell/e-shell-view.c:114
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr "( HiГ bir dizin gЖsterilmiyor )"
 
-#: shell/e-shell-view.c:342
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Dizinler"
 
-#: shell/e-shell-view.c:736
-msgid "None"
-msgstr "Yok"
-
-#: shell/e-shell-view.c:740
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell.c:291
+#: shell/e-shell.c:372
 #, c-format
 msgid "Cannot set up local storage -- %s"
 msgstr "Yerel kaydЩ kuramadЩm -- %s"
 
-#: shell/e-shortcuts-view.c:235
-msgid "_Small icons"
+#: shell/e-shell.c:1208
+#, c-format
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:122
+#, fuzzy
+msgid "Create new shortcut group"
+msgstr "Yeni bir tanЩk birimi yarat"
+
+#: shell/e-shortcuts-view.c:125
+#, fuzzy
+msgid "Group name:"
+msgstr "Tam ismi :"
+
+#: shell/e-shortcuts-view.c:234
+#, c-format
+msgid ""
+"Do you really want to remove group\n"
+"`%s' from the shortcut bar?"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:239
+msgid "Don't remove"
+msgstr ""
+
+#: shell/e-shortcuts-view.c:250
+#, fuzzy
+msgid "_Small Icons"
 msgstr "_Ufak ikonalar"
 
-#: shell/e-shortcuts-view.c:236
+#: shell/e-shortcuts-view.c:251
 msgid "Show the shortcuts as small icons"
 msgstr "KЩsayollarЩ ufak ikonalar olarak gЖster"
 
-#: shell/e-shortcuts-view.c:238
-msgid "_Large icons"
+#: shell/e-shortcuts-view.c:253
+#, fuzzy
+msgid "_Large Icons"
 msgstr "_BЭyЭk ikonalar"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Show the shortcuts as large icons"
 msgstr "KЩsayollarЩ bЭyЭk ikonalar olarak gЖster"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:265
+#, fuzzy
+msgid "_New Group..."
+msgstr "Yeni ..."
+
+#: shell/e-shortcuts-view.c:266
+#, fuzzy
+msgid "Create a new shortcut group"
+msgstr "Yeni bir tanЩk birimi yarat"
+
+#: shell/e-shortcuts-view.c:268
+msgid "_Remove This Group..."
+msgstr ""
+
+#: shell/e-shortcuts-view.c:269
+#, fuzzy
+msgid "Remove this shortcut group"
+msgstr "Bu kЩsayolu kЩsayol ГubuПundan sil"
+
+#: shell/e-shortcuts-view.c:353
 msgid "Activate"
 msgstr "GeГerli yap"
 
-#: shell/e-shortcuts-view.c:330
+#: shell/e-shortcuts-view.c:353
 msgid "Activate this shortcut"
 msgstr "Bu kЩsayolu geГerli yap"
 
-#: shell/e-shortcuts-view.c:333
+#: shell/e-shortcuts-view.c:356
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Bu kЩsayolu kЩsayol ГubuПundan sil"
 
@@ -3054,59 +5450,66 @@ msgstr "Bu kЩsayolu kЩsayol ГubuПundan sil"
 msgid "Error saving shortcuts."
 msgstr "KЩsayollarЩ kaydederken hata oldu."
 
-#: shell/e-storage.c:217
+#: 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
+msgid "_View"
+msgstr "_GЖster"
+
+#: shell/e-storage-set-view.c:235
+#, fuzzy
+msgid "View the selected folder"
+msgstr "SeГili iletiyi yazdЩr"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr "( Ismi yok )"
 
-#: shell/e-storage.c:412
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Hata yok"
 
-#: shell/e-storage.c:414
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr "Genel hata"
 
-#: shell/e-storage.c:416
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "AynЩ isimli bir klasЖr zaten var"
 
-#: shell/e-storage.c:418
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Belirtilen klasЖr tipi geГerli deПildir"
 
-#: shell/e-storage.c:420
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "V/D hatasЩ"
 
-#: shell/e-storage.c:422
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "KlasЖrЭ yaratmak iГin gerekli disk alanЩ yok"
 
-#: shell/e-storage.c:424
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Belirtilen klasЖr bulunamadЩ"
 
-#: shell/e-storage.c:426
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr "IЧlem yazЩlmamЩЧtЩr"
 
-#: shell/e-storage.c:428
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr "Izin yok"
 
-#: shell/e-storage.c:430
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "IЧlem desteklenmiyor"
 
-#: shell/e-storage.c:432
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr "Bu kayЩtta belirtilen tip desteklenmiyor"
 
-#: shell/e-storage.c:434
-msgid "Unknown error"
-msgstr "Bilinmeyen hata"
-
-#: shell/main.c:66
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -3145,7 +5548,7 @@ msgstr ""
 "AПЩr bir iЧin sonucunu beПindiПinizi umup, sizin katkЩlarЩnЩ\n"
 "bekliyoruz !\n"
 
-#: shell/main.c:93
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -3153,84 +5556,1212 @@ msgstr ""
 "TeЧekkЭrler\n"
 "Evolution TakЩmЩ\n"
 
-#: shell/main.c:121
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Evolution komutasЩnЩ baЧlatamadЩm ."
 
-#: shell/main.c:156
+#: shell/main.c:178
+msgid "Disable."
+msgstr ""
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Bonobo parГalar sistemini baЧlatamadЩm."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: widgets/e-table/e-table-config.glade.h:7
-msgid "Fields"
-msgstr "Birimler"
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
+msgid "N_ew Directory Server"
+msgstr "Yeni _dizin sunucusu"
 
-#: widgets/e-table/e-table-config.glade.h:8
-msgid "Grouping"
-msgstr "Kitle"
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
+msgid "_Actions"
+msgstr "E_ylemler"
 
-#: widgets/e-table/e-table-config.glade.h:9
-msgid "Sort"
-msgstr "SЩrala"
+#: po/tmp/evolution-addressbook.xml.h:7
+msgid "Create a new contact"
+msgstr "Yeni bir tanЩk birimi yarat"
+
+#: po/tmp/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
+msgid "Find"
+msgstr "Bul"
+
+#: po/tmp/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
+msgid "New"
+msgstr "Yeni"
+
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
+msgstr "TanЩklarЩy azdЩrt"
+
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:16
+#, fuzzy
+msgid "Stop Loading"
+msgstr "GЖlgeleme"
+
+#: po/tmp/evolution-addressbook.xml.h:17
+#, fuzzy
+msgid "View All"
+msgstr "_GЖster"
+
+#: po/tmp/evolution-addressbook.xml.h:18
+#, fuzzy
+msgid "View all contacts"
+msgstr "Bir tanЩПЩ bul"
+
+#: po/tmp/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "TanЩklarЩy azdЩrt"
+
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+msgid "_Tools"
+msgstr "_гerezler"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-calendar.xml.h:6
+msgid "5 Days"
+msgstr "5 gЭn"
+
+#: po/tmp/evolution-calendar.xml.h:7
+#, fuzzy
+msgid "Alter preferences"
+msgstr "Ayarlar"
+
+#: po/tmp/evolution-calendar.xml.h:8
+#, fuzzy
+msgid "Ca_lendar"
+msgstr "Yeni _takvim"
+
+#: po/tmp/evolution-calendar.xml.h:9
+#, fuzzy
+msgid "Calendar Preferences..."
+msgstr "Ayarlar"
+
+#: po/tmp/evolution-calendar.xml.h:10
+msgid "Create a new appointment"
+msgstr "Yeni bir toplantЩ"
+
+#: po/tmp/evolution-calendar.xml.h:11
+msgid "Create a new calendar"
+msgstr "Yeni bir takvimi yarat"
+
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr "GЭn"
+
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr "Zamanda geri git"
+
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr "Zamanda ileri git"
+
+#: po/tmp/evolution-calendar.xml.h:15
+msgid "Go to"
+msgstr "Git"
+
+#: po/tmp/evolution-calendar.xml.h:16
+msgid "Go to a specific date"
+msgstr "Belirli bir tarihe git"
+
+#: po/tmp/evolution-calendar.xml.h:17
+msgid "Go to present time"
+msgstr "чimdiki zamana git"
+
+#: po/tmp/evolution-calendar.xml.h:18
+msgid "Month"
+msgstr "Ay"
+
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+msgid "Next"
+msgstr "Ileri"
+
+#: po/tmp/evolution-calendar.xml.h:21
+msgid "Open a calendar"
+msgstr "Bir takvimi aГ"
+
+#: po/tmp/evolution-calendar.xml.h:22
+msgid "Prev"
+msgstr "Geri"
+
+#: po/tmp/evolution-calendar.xml.h:24
+msgid "Print this calendar"
+msgstr "Bu takvimi yazdЩrt"
+
+#: po/tmp/evolution-calendar.xml.h:25
+msgid "Save calendar as something else"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr "1 gЭnЭ gЖster"
+
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr "1 ayЩ gЖster"
+
+#: po/tmp/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr "2 haftayЩ Жster"
+
+#: po/tmp/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
+msgid "Today"
+msgstr "BugЭn"
+
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Hafta"
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+msgid "_New"
+msgstr "_Yeni"
+
+#: po/tmp/evolution-calendar.xml.h:33
+#, fuzzy
+msgid "_Open Calendar"
+msgstr "_Takvimi aГ"
+
+#: po/tmp/evolution-calendar.xml.h:34
+#, fuzzy
+msgid "_Print this calendar"
+msgstr "Bu takvimi yazdЩrt"
+
+#: po/tmp/evolution-calendar.xml.h:35
+#, fuzzy
+msgid "_Save Calendar As"
+msgstr "Takvimi farklЩ kaydet"
+
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Bu birimi sil"
+
+#: po/tmp/evolution-contact-editor.xml.h:8
+#, fuzzy
+msgid "Delete..."
+msgstr "Sil"
+
+#: po/tmp/evolution-contact-editor.xml.h:9
+#, fuzzy
+msgid "Help"
+msgstr "_Bark"
+
+#: po/tmp/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
+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
+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
+#, fuzzy
+msgid "Save _As..."
+msgstr "FarklЩ kaydet ..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr "Kaydet ve kapat"
+
+#: po/tmp/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
+msgid "Se_nd contact to other..."
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
+msgid "See online help"
+msgstr "YardЩma bak"
+
+#: po/tmp/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
+msgid "_File"
+msgstr "_Dosya"
+
+#: po/tmp/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
+#, fuzzy
+msgid "_Save"
+msgstr "_FarklЩ kaydet ..."
+
+#.
+#. * 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
+msgid "About this application"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "About..."
+msgstr "YazЩ tipi ..."
+
+#: po/tmp/evolution-event-editor.xml.h:8
+msgid "Actio_ns"
+msgstr "E_ylemler"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "Araba"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "Kes"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Clear"
+msgstr "Araba"
+
+#: po/tmp/evolution-event-editor.xml.h:12
+msgid "Clear the selection"
+msgstr ""
+
+#: po/tmp/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
+msgid "Copy"
+msgstr "Kopyala"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:17
+msgid "Cut"
+msgstr "Kes"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
+msgstr "ABY : Adres _defteri ..."
+
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr "ABY : SeГme _formu ..."
+
+#: po/tmp/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
+msgid "FIXME: Cop_y to Folder..."
+msgstr "ABY : Dizine _kopyala ..."
+
+#: po/tmp/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
+#, fuzzy
+msgid "FIXME: Define Print _Styles"
+msgstr "ABY : YazdЩrma _stilini belirle"
+
+#: po/tmp/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
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr "ABY : Dizindeki _ilk birim"
+
+#: po/tmp/evolution-event-editor.xml.h:31
+msgid "FIXME: For_ward"
+msgstr "ABY : _Ilet"
+
+#: po/tmp/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
+msgid "FIXME: Help"
+msgstr "ABY : YardЩm"
+
+#: po/tmp/evolution-event-editor.xml.h:34
+#, fuzzy
+msgid "FIXME: In_complete Task"
+msgstr "ABY : _GЖrev"
+
+#: po/tmp/evolution-event-editor.xml.h:35
+#, fuzzy
+msgid "FIXME: Insert File"
+msgstr "ABY : Dosya iГer ..."
+
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr "ABY : Bi_rim ..."
+
+#: po/tmp/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
+msgid "FIXME: Print Pre_view"
+msgstr "ABY : YazdЩrma Жnizlemesi"
+
+#: po/tmp/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
+msgid "FIXME: Publish _Form..."
+msgstr "ABY : _Formu aГЩkla ..."
+
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr "ABY : _Kaynaklar ..."
+
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr "ABY : GЖ_nder"
+
+#: po/tmp/evolution-event-editor.xml.h:43
+msgid "FIXME: Save Attac_hments..."
+msgstr "ABY : Eklem _ekle ..."
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr "ABY : Denetlem ГЖ_zЭmleyicisi"
+
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
+msgstr "ABY : GЖrev _isteПi"
+
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr "ABY : _TanЩk"
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr "ABY : _жzelleЧtir ..."
+
+#: po/tmp/evolution-event-editor.xml.h:48
+msgid "FIXME: _File..."
+msgstr "ABY : _Dosya ..."
+
+#: po/tmp/evolution-event-editor.xml.h:49
+msgid "FIXME: _Font..."
+msgstr "ABY : _YazЩ tipi ..."
+
+#: po/tmp/evolution-event-editor.xml.h:50
+#, fuzzy
+msgid "FIXME: _Formatting"
+msgstr "ABY : __чekillendirme"
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
+msgstr "ABY : _Birim"
+
+#: po/tmp/evolution-event-editor.xml.h:52
+msgid "FIXME: _Journal Entry"
+msgstr "ABY : GЭ_nlЭk birimi"
+
+#: po/tmp/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
+msgid "FIXME: _Mail Message"
+msgstr "ABY : e_Posta iletisi"
+
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr "ABY : _AnЩ stili"
+
+#: po/tmp/evolution-event-editor.xml.h:56
+msgid "FIXME: _Move to Folder..."
+msgstr "ABY : Dizine _taЧЩ ..."
+
+#: po/tmp/evolution-event-editor.xml.h:57
+msgid "FIXME: _New Appointment"
+msgstr "ABY : _Yeni toplantЩ"
+
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
+msgstr "ABY : _Not"
+
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
+msgstr "ABY : _Nesne ..."
+
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
+msgstr "ABY : _FЩkra ..."
+
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr "ABY : _Imla ..."
+
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr "ABY : _Vasat"
+
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr "ABY : _GЖrev"
+
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr "ABY : _OkunmamЩЧ birim"
+
+#: po/tmp/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
+msgid "F_ormat"
+msgstr "чeki_l"
+
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr "Ilerideki birime git"
+
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr "Gerideki birime git"
+
+#: po/tmp/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
+#, fuzzy
+msgid "N_ext"
+msgstr "Ileri"
+
+#: po/tmp/evolution-event-editor.xml.h:75
+msgid "Paste"
+msgstr "YapЩЧtЩr"
+
+#: po/tmp/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
+msgid "Pre_vious"
+msgstr "_Geri"
+
+#: po/tmp/evolution-event-editor.xml.h:78
+#, fuzzy
+msgid "Previous"
+msgstr "_Geri"
+
+#: po/tmp/evolution-event-editor.xml.h:79
+#, fuzzy
+msgid "Print S_etup..."
+msgstr "YazdЩr ..."
+
+#: po/tmp/evolution-event-editor.xml.h:80
+#, fuzzy
+msgid "Print Setup"
+msgstr "Sayfa _kurulumu"
+
+#: po/tmp/evolution-event-editor.xml.h:83
+#, fuzzy
+msgid "Properties"
+msgstr "жzellikler ..."
+
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "Radyo"
+
+#: po/tmp/evolution-event-editor.xml.h:85
+msgid "Redo the undone action"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "Cevapla"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "Save the current file"
+msgstr "Imza dosyasЩ : "
+
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:99
+#, fuzzy
+msgid "Select All"
+msgstr "Hepsine cevapla"
+
+#: po/tmp/evolution-event-editor.xml.h:100
+msgid "Select everything"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "_About..."
+msgstr "_Evolution bilgisi ..."
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "Kapat"
+
+#: po/tmp/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
+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
+msgid "_Edit"
+msgstr "_DeПiЧtir"
+
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "Bul"
+
+#: po/tmp/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
+msgid "_Help"
+msgstr "_Bark"
+
+#: po/tmp/evolution-event-editor.xml.h:114
+msgid "_Insert"
+msgstr "_IГer"
+
+#: po/tmp/evolution-event-editor.xml.h:115
+msgid "_Object"
+msgstr "_Nesne"
+
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "YapЩЧtЩr"
+
+#: po/tmp/evolution-event-editor.xml.h:117
+#, fuzzy
+msgid "_Print"
+msgstr "YazdЩr"
+
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "жzellikler ..."
+
+#: po/tmp/evolution-event-editor.xml.h:119
+#, fuzzy
+msgid "_Redo"
+msgstr "Radyo"
+
+#: po/tmp/evolution-event-editor.xml.h:120
+#, fuzzy
+msgid "_Replace..."
+msgstr "_AГ ..."
+
+#: po/tmp/evolution-event-editor.xml.h:122
+msgid "_Toolbars"
+msgstr "_AraГ ГubuklarЩ"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+#, fuzzy
+msgid "_Undo"
+msgstr "_GЖnder"
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
+msgid "Compose"
+msgstr "Yaz"
+
+#: po/tmp/evolution-mail.xml.h:7
+msgid "Compose a new message"
+msgstr "Yeni bir ePosta iletisini yaz"
+
+#: po/tmp/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
+#, fuzzy
+msgid "F_older"
+msgstr "_Dizin"
+
+#: po/tmp/evolution-mail.xml.h:14
+msgid "Fi_lter on Sender"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:15
+msgid "Filter on Rec_ipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr "_ParolalarЩ unut"
+
+#: po/tmp/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Get Mail"
+msgstr "ePosta'yЩ al"
+
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
+msgstr "ePosta _filtralarЩ ..."
+
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "AnlatЩm :"
+
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Mar_k As Read"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:24
+#, fuzzy
+msgid "Mark As U_nread"
+msgstr "ABY : _OkunmamЩЧ olarak iЧaretle"
+
+#: po/tmp/evolution-mail.xml.h:25
+msgid "Move"
+msgstr "TaЧЩ"
+
+#: po/tmp/evolution-mail.xml.h:26
+msgid "Move message to a new folder"
+msgstr "Iletiyi yeni bir dizine taЧЩ"
+
+#: po/tmp/evolution-mail.xml.h:27
+msgid "Previews the message to be printed"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "YazdЩrma Жnizlemesi"
+
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:31
+#, fuzzy
+msgid "Print message..."
+msgstr "YazdЩr ..."
+
+#: po/tmp/evolution-mail.xml.h:35
+#, fuzzy
+msgid "Reply to _All"
+msgstr "Hepsine cevapla"
+
+#: po/tmp/evolution-mail.xml.h:36
+#, fuzzy
+msgid "Reply to _Sender"
+msgstr "Hepsine cevapla"
+
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#, fuzzy
+msgid "Select _All"
+msgstr "Hepsine cevapla"
+
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:41
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Iletilerin k_onu listesi"
+
+#: po/tmp/evolution-mail.xml.h:42
+msgid "VFolder on Se_nder"
+msgstr ""
 
-#: widgets/e-table/e-table-config.glade.h:10
-msgid "Filter"
+#: po/tmp/evolution-mail.xml.h:43
+msgid "VFolder on _Recipients"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:45
+#, fuzzy
+msgid "_Apply Filters"
 msgstr "Filtra"
 
+#: po/tmp/evolution-mail.xml.h:46
+msgid "_Configure Folder"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "Dizine _git ..."
+
+#: po/tmp/evolution-mail.xml.h:49
+#, fuzzy
+msgid "_Edit Message"
+msgstr "Iletiyi gЖnder"
+
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
+msgstr "_Temizle"
+
+#: po/tmp/evolution-mail.xml.h:51
+msgid "_Filter on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:52
+#, fuzzy
+msgid "_Forward"
+msgstr "Ilet"
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:54
+#, fuzzy
+msgid "_Mail Configuration"
+msgstr "ePosta ayarlamasЩ"
+
+#: po/tmp/evolution-mail.xml.h:55
+#, fuzzy
+msgid "_Message"
+msgstr "Iletiyi kaydet"
+
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "ABY : Dizine _taЧЩ ..."
+
+#: po/tmp/evolution-mail.xml.h:57
+msgid "_Open in New Window"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:58
+#, fuzzy
+msgid "_Print Message"
+msgstr "Iletiyi gЖnder"
+
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "_FarklЩ kaydet ..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Kaynak ekle"
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Sil"
+
+#: po/tmp/evolution-mail.xml.h:63
+msgid "_VFolder on Subject"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
+msgstr "_Sanal Dizin SihirbazЩ ..."
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: widgets/e-table/e-table-field-chooser.glade.h:7
-msgid "Field Chooser"
-msgstr "Birim seГmeni"
+#: po/tmp/evolution-message-composer.xml.h:6
+msgid "Attach"
+msgstr "Ekle"
 
-#: widgets/e-table/e-table-field-chooser.glade.h:8
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
+#: po/tmp/evolution-message-composer.xml.h:9
+msgid "Close the current file"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
+msgstr "HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:12
+msgid "Insert a file as text into the message"
+msgstr "Bir dosyayЩ metin olarak ekle"
+
+#: po/tmp/evolution-message-composer.xml.h:13
+#, fuzzy
+msgid "Insert text file..."
+msgstr "_Metin dosyasЩnЩ iГer ... ( ABY )"
+
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "DosyayЩ aГ"
+
+#: po/tmp/evolution-message-composer.xml.h:17
+#, fuzzy
+msgid "Save As"
+msgstr "FarklЩ kaydet ..."
+
+#: po/tmp/evolution-message-composer.xml.h:19
+#, fuzzy
+msgid "Save in _folder... (FIXME)"
+msgstr "_Dizinde kaydet ..."
+
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "_Dizinde kaydet ..."
+
+#: po/tmp/evolution-message-composer.xml.h:22
+#, 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
+msgid "Save the message in a specified folder"
+msgstr "Iletiyi belirlenen dizinde kaydet"
+
+#: po/tmp/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "GЖnder"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+msgid "Send _Later"
 msgstr ""
-"гizgiyene bir sЭtun eklemek iГin, o Гizgiyeyi\n"
-"istediПin yere bЩrakabilirsin ."
+
+#: po/tmp/evolution-message-composer.xml.h:26
+msgid "Send _later"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:27
+msgid "Send the mail in HTML format"
+msgstr "ePostayЩ HTML Чeklinde gЖnder"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "Iletiyi gЖnder"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "Iletiyi gЖnder"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Bu iletiyi gЖnder"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Eklemleri gЖster/gizle"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+msgid "Show _attachments"
+msgstr "_Eklemleri gЖster"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "_Eklemleri gЖster"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
+msgstr "_Metin dosyasЩnЩ iГer ... ( ABY )"
+
+#: po/tmp/evolution-message-composer.xml.h:41
+msgid "_Open..."
+msgstr "_AГ ..."
 
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: widgets/e-table/e-table-group.glade.h:7
-msgid "window1"
-msgstr "pencere1"
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:8
-msgid "Available fields"
-msgstr "Varolan birimler"
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr ""
 
-#: widgets/e-table/e-table-group.glade.h:9
-msgid "label1"
-msgstr "yafta1"
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
+msgstr "DeПiЧik bir dizini gЖster"
+
+#: po/tmp/evolution.xml.h:7
+#, fuzzy
+msgid "E_xit"
+msgstr "гЩ_k ..."
+
+#: po/tmp/evolution.xml.h:8
+msgid "Evolution bar _shortcut"
+msgstr "Evolution ГubuПu _kЩsayolu"
+
+#: po/tmp/evolution.xml.h:9
+msgid "Exit the program"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:10
+#, fuzzy
+msgid "Getting _Started"
+msgstr "Na_sЩl baЧlarЩm"
+
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
+msgstr "Evolution hakkЩnda bilgi gЖster"
+
+#: po/tmp/evolution.xml.h:12
+#, fuzzy
+msgid "Show the _Folder Bar"
+msgstr "Dizinler ГubuПunu gЖsterir"
+
+#: po/tmp/evolution.xml.h:13
+#, fuzzy
+msgid "Show the _Shortcut Bar"
+msgstr "KЩsayol ГubuПunu gЖsterir"
+
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "_Hata raporunu gЖnder"
+
+#: po/tmp/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
+#, fuzzy
+msgid "Toggle whether to show the folder bar"
+msgstr "Dizinler ГubuПunu gЖsterir"
+
+#: po/tmp/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
+#, fuzzy
+msgid "Using the C_ontact Manager"
+msgstr "Ta_nЩklar yЖneticisini nasЩl kullanЩrЩm"
+
+#: po/tmp/evolution.xml.h:19
+#, fuzzy
+msgid "Using the _Calendar"
+msgstr "_Takvimi nasЩl kullanЩrЩm"
+
+#: po/tmp/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
+msgid "_About Evolution..."
+msgstr "_Evolution bilgisi ..."
+
+#: po/tmp/evolution.xml.h:22
+msgid "_Appointment (FIXME)"
+msgstr "T_oplantЩ"
 
-#: widgets/e-table/e-table-group.glade.h:10
-msgid "Show in this order"
-msgstr "Bu sЩralamada gЖster"
+#: po/tmp/evolution.xml.h:23
+msgid "_Contact (FIXME)"
+msgstr "_TanЩk"
+
+#: po/tmp/evolution.xml.h:26
+msgid "_Folder"
+msgstr "_Dizin"
+
+#: po/tmp/evolution.xml.h:27
+#, fuzzy
+msgid "_Go to Folder..."
+msgstr "Dizine _git ..."
 
-#: widgets/e-table/e-table-group.glade.h:11
-msgid "label2"
-msgstr "yafta2"
+#: po/tmp/evolution.xml.h:29
+#, fuzzy
+msgid "_Index"
+msgstr "_IГer"
+
+#: po/tmp/evolution.xml.h:30
+msgid "_Mail message (FIXME)"
+msgstr "e_Posta iletisi"
+
+#: po/tmp/evolution.xml.h:32
+#, fuzzy
+msgid "_Settings"
+msgstr "AyarlarЩ dene"
 
-#: widgets/e-table/e-table-group.glade.h:12
-msgid "Add >>"
-msgstr "Ekle >>"
+#: po/tmp/evolution.xml.h:33
+msgid "_Task (FIXME)"
+msgstr "_GЖrev"
 
-#: widgets/e-table/e-table-group.glade.h:13
-msgid "<< Remove"
-msgstr "<< Sil"
+#. 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
+#, fuzzy
+msgid "%A, %B %d, %Y"
+msgstr "%a %b %d %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
@@ -3308,17 +6839,339 @@ msgstr "ToplantЩ bitiЧ saati :"
 msgid "All Attendees"
 msgstr "Yekin ziyaretciler"
 
-#: widgets/misc/e-clipped-label.c:106
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
+msgid "%B %Y"
+msgstr ""
+
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-dateedit.c:408
+#, 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
+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
+msgid "%I:%M %p"
+msgstr ""
+
 #: widgets/shortcut-bar/e-group-bar.c:632
 #, c-format
 msgid "Group %i"
 msgstr "Kitle %i"
 
-#~ msgid "Edit Filter"
-#~ msgstr "Filtralarla oyna"
+#~ msgid "FIXME: _Appointment"
+#~ msgstr "ABY : _ToplantЩ"
+
+#~ msgid "FIXME: Meeting Re_quest"
+#~ msgstr "ABY : ToplantЩ is_teПi"
+
+#~ msgid "Ne_xt"
+#~ msgstr "_Ileri"
+
+#~ msgid "FIXME: _New Contact"
+#~ msgstr "ABY : _Yeni tanЩk"
+
+#~ msgid "FIXME: New _Contact from Same Company"
+#~ msgstr "ABY : AynЩ Чi_rketten yeni bir tanЩk"
+
+#~ msgid "FIXME: New _Letter to Contact"
+#~ msgstr "ABY : TanЩПa yeni bir _mektup"
+
+#~ msgid "FIXME: New Meetin_g with Contact"
+#~ msgstr "ABY : TanЩkla yeni bir t_oplantЩ"
+
+#~ msgid "FIXME: _Plan a Meeting..."
+#~ msgstr "ABY : _Bir toplantЩyЩ tasarЩ et ..."
+
+#~ msgid "FIXME: New _Task for Contact"
+#~ msgstr "ABY : TanЩk iГin yeni bir _gЖrev"
+
+#~ msgid "FIXME: New _Journal Entry for Contact"
+#~ msgstr "ABY : TanЩk iГin yeni bir gЭ_nlЭk birimi"
+
+#~ msgid "FIXME: _Flag for Follow Up..."
+#~ msgstr "ABY : I_letme iГin iЧaretle ..."
+
+#~ msgid "FIXME: _Display Map of Address"
+#~ msgstr "ABY : _Adresin haritasЩnЩ gЖster"
+
+#~ msgid "FIXME: _Open Web Page"
+#~ msgstr "ABY : _Websitesini aГ"
+
+#~ msgid "FIXME: Forward as _vCard"
+#~ msgstr "ABY : v_Calendat Чeklinde ilet"
+
+#~ msgid "Insert a file as an attachment"
+#~ msgstr "Bir dosyayЩ eklem olarak ekle"
+
+#~ msgid "FIXME: Previous"
+#~ msgstr "ABY : Geri"
+
+#~ msgid "FIXME: Next"
+#~ msgstr "ABY : Ileri"
+
+#~ msgid "_New Contact"
+#~ msgstr "_Yeni tanЩk"
+
+#~ msgid "window2"
+#~ msgstr "pencere2"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "Gnome Takvimi"
+
+#~ msgid "The GNOME personal calendar and schedule manager."
+#~ msgstr "GNOME Чahsi takvim ve gЖrev yЖnetmeni ."
+
+#~ msgid "Year"
+#~ msgstr "YЩl"
+
+#~ msgid "Show 1 year"
+#~ msgstr "1 seneyi gЖster"
+
+#~ msgid "_New appointment..."
+#~ msgstr "_Yeni toplantЩ ..."
+
+#~ msgid "New appointment for _today..."
+#~ msgstr "_BugЭn iГin yeni bir toplantЩ ..."
+
+#~ msgid "Create a new appointment for today"
+#~ msgstr "BugЭn iГin yeni bir toplantЩ yarat"
+
+#~ msgid "About Calendar"
+#~ msgstr "TakvЩm bilgisi"
+
+#~ msgid "%s%s"
+#~ msgstr "%s%s"
+
+#~ msgid "'s calendar"
+#~ msgstr "'in takvimi"
+
+#~ msgid "?"
+#~ msgstr "?"
+
+#~ msgid "FIXME: _Delete"
+#~ msgstr "ABY : _Sil"
+
+#~ msgid "FIXME: Ca_lendar..."
+#~ msgstr "ABY : _Takvim ..."
+
+#~ msgid "FIXME: Invite _Attendees..."
+#~ msgstr "ABY : _ZiyaretГileri davet et .."
+
+#~ msgid "FIXME: C_ancel Invitation..."
+#~ msgstr "ABY : Daveti i_ptal et ..."
+
+#~ msgid "FIXME: Save and Close"
+#~ msgstr "ABY : KAydet ve kapat"
+
+#~ msgid "FIXME: Print..."
+#~ msgstr "ABY : YazdЩr ..."
+
+#~ msgid "FIXME: Invite Attendees..."
+#~ msgstr "ABY : ZiyaretГileri davet et .."
+
+#~ msgid "Invite attendees to a meeting"
+#~ msgstr "ZiyaretcЩleri davet et"
+
+#~ msgid "FIXME: Delete"
+#~ msgstr "ABY : Sil"
+
+#~ msgid "Create to-do item"
+#~ msgstr "Bir \"YapЩlacak\" birimi yarat"
+
+#~ msgid "Edit to-do item"
+#~ msgstr "Bir \"YapЩlacak\" birimini deПiЧtir"
+
+#~ msgid "Add to-do item..."
+#~ msgstr "Bir \"YapЩlacak\" birimini ekle ..."
+
+#~ msgid "Edit this item..."
+#~ msgstr "Bu birimi deПiЧtir ..."
+
+#~ msgid "To-do list"
+#~ msgstr "\"YapЩlacak\"'lar listesi"
+
+#~ msgid "Edit..."
+#~ msgstr "DeПiЧtir ..."
+
+#~ msgid "Weeks"
+#~ msgstr "Hafta"
+
+#~ msgid "Hour"
+#~ msgstr "Saat"
+
+#~ msgid "Minute"
+#~ msgstr "Dakika"
+
+#~ msgid "Second"
+#~ msgstr "Saniye"
+
+#~ msgid "TODO Items"
+#~ msgstr "\"YapЩlacak\" birimleri"
+
+#~ msgid "%a"
+#~ msgstr "%a"
+
+#~ msgid "%b"
+#~ msgstr "%b"
+
+#~ msgid "Current week (%s %s %d - %s %s %d %d)"
+#~ msgstr "GeГerli hafta ( %s %s %d - %s %s %d %d )"
+
+#~ msgid "Current week (%s %s %d %d - %s %s %d %d)"
+#~ msgstr "GeГerli hafta ( %s %s %d %d - %s %s %d %d )"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Hafta'nЩn baЧlama gЭnЭ"
+
+#~ msgid "Day range"
+#~ msgstr "GЭn sЩnЩrlarЩ"
+
+#~ msgid ""
+#~ "Please select the start and end hours you want\n"
+#~ "to be displayed in the day view and week view.\n"
+#~ "Times outside this range will not be displayed\n"
+#~ "by default."
+#~ msgstr ""
+#~ "GЖn ve hafta bakЩЧЩnda gЖsterilinecek baЧlama ve\n"
+#~ "bitme saatlerini belirle .\n"
+#~ "Bu saatlerin dЩЧЩnda kalan saatler normal bakЩЧta\n"
+#~ "gЖsterilmeyecektir."
+
+#~ msgid "Day start:"
+#~ msgstr "GЭn baЧlangЩГЩ :"
+
+#~ msgid "Day end:"
+#~ msgstr "GЭn bitimi :"
+
+#~ msgid "Show on TODO List:"
+#~ msgstr "\"YapЩlacak\"'lar listesinde gЖster :"
+
+#~ msgid "Highlight not yet due items"
+#~ msgstr "Daha zamanЩ geГmemiЧ bilgileri \"gЖzЖnЭne\" ser"
+
+#~ msgid "To Do List"
+#~ msgstr "\"YapЩlacak\"'lar listesi"
+
+#~ msgid "Alarm Properties"
+#~ msgstr "Ikaz Жzellikleri"
+
+#~ msgid "Beep on display alarms"
+#~ msgstr "Ekran ikazlarЩnda tЩngЩrtЩ yap"
+
+#~ msgid "Cut selected item into clipboard"
+#~ msgstr "SeГili birimi arabelleПe kes"
+
+#~ msgid "Copy selected item into clipboard"
+#~ msgstr "SeГili birimi arabelleПe kopyala"
+
+#~ msgid "Select recipients' addresses"
+#~ msgstr "GЖnderilecek adresleri belirle"
+
+#~ msgid "Name"
+#~ msgstr "Isim"
+
+#~ msgid "To: >>"
+#~ msgstr "Gn : >>"
+
+#~ msgid "Cc: >>"
+#~ msgstr "Cc : >>"
+
+#~ msgid "Bcc: >>"
+#~ msgstr "Bcc : >>"
+
+#~ msgid "label9"
+#~ msgstr "yafta9"
+
+#~ msgid "label7"
+#~ msgstr "yafta7"
+
+#~ msgid "label8"
+#~ msgstr "yafta8"
+
+#~ msgid "Discard this message?"
+#~ msgstr "Bu iletiyi unutalЩm mЩ ?"
+
+#~ msgid "Load a previously saved message"
+#~ msgstr "жnceden kaydedilmiЧ iletiyi yЭkle"
+
+#~ msgid "_Close..."
+#~ msgstr "_Kapat"
+
+#~ msgid "_Format"
+#~ msgstr "чe_kil"
+
+#~ msgid "Check for new mail"
+#~ msgstr "Yeni ePosta iГin bak"
+
+#~ 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 :"
+
+#~ msgid "To"
+#~ msgstr "Gn:"
+
+#~ msgid "Size"
+#~ msgstr "Boyut"
+
+#~ msgid "_Create new folder..."
+#~ msgstr "_Yeni bir dizini yarat ..."
+
+#~ msgid "Show _shortcut bar"
+#~ msgstr "KЩ_sayol ГubuПunu gЖster"
+
+#~ msgid "Show _folder bar"
+#~ msgstr "Di_zinler ГubuПunu gЖster"
+
+#~ msgid "Help _index"
+#~ msgstr "YardЩm _iГeriПi"
+
+#~ msgid "Fields"
+#~ msgstr "Birimler"
+
+#~ msgid "Field Chooser"
+#~ msgstr "Birim seГmeni"
+
+#~ msgid ""
+#~ "To add a column to your table, drag it into\n"
+#~ "the location in which you want it to appear."
+#~ msgstr ""
+#~ "гizgiyene bir sЭtun eklemek iГin, o Гizgiyeyi\n"
+#~ "istediПin yere bЩrakabilirsin ."
+
+#~ msgid "window1"
+#~ msgstr "pencere1"
+
+#~ msgid "Available fields"
+#~ msgstr "Varolan birimler"
+
+#~ msgid "Show in this order"
+#~ msgstr "Bu sЩralamada gЖster"
+
+#~ msgid "label2"
+#~ msgstr "yafta2"
+
+#~ msgid "Add >>"
+#~ msgstr "Ekle >>"
+
+#~ msgid "<< Remove"
+#~ msgstr "<< Sil"
 
 #~ msgid "Create filter"
 #~ msgstr "Filtra yarat"
@@ -3329,9 +7182,6 @@ msgstr "Kitle %i"
 #~ msgid "Finish"
 #~ msgstr "Bitir"
 
-#~ msgid "Cancel"
-#~ msgstr "Iptal"
-
 #~ msgid "Apply"
 #~ msgstr "Uygula"
 
@@ -3342,27 +7192,12 @@ msgstr "Kitle %i"
 #~ "<h2>Filtra kuralЩnЩ kur</h2><p>Alttaki kurallardan bir tanesini seГip, o "
 #~ "kuralЩ ЖzelleЧtirmeye devam et .</p>"
 
-#~ msgid "_Virtual Folder Druid ..."
-#~ msgstr "_Sanal Dizin SihirbazЩ ..."
-
 #~ msgid "Test these values before continuing"
 #~ msgstr "Bu deПerleri devam etmekten Жnce bir dene"
 
 #~ msgid "Select the method you would like to use to deliver your mail."
 #~ msgstr "ePostanЩ gЖnderirken tercih ettiПin tЭrЭ belirle."
 
-#~ msgid "Mail Configuration"
-#~ msgstr "ePosta ayarlamasЩ"
-
-#~ msgid "Identity"
-#~ msgstr "Kimlik"
-
-#~ msgid "Mail Source"
-#~ msgstr "ePosta kaynaПЩ"
-
-#~ msgid "Mail Transport"
-#~ msgstr "ePosta transferi"
-
 #~ msgid "Enter the hostname of the News Server you have."
 #~ msgstr "Haber sunucusunun adresini ver ."
 
diff --git a/po/uk.po b/po/uk.po
index a2e9df58ab..ea9afb723e 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.1\n"
-"POT-Creation-Date: 2000-11-01 11:50+0200\n"
+"POT-Creation-Date: 2000-12-13 16:26-0600\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"
@@ -13,14 +13,242 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-u\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: addressbook/backend/ebook/e-card.c:3046
+#, fuzzy
+msgid "Card: "
+msgstr "Авто"
+
+#: addressbook/backend/ebook/e-card.c:3048
+#, fuzzy
+msgid ""
+"\n"
+"Name: "
+msgstr "╤м'я:"
+
+#: addressbook/backend/ebook/e-card.c:3049
+msgid ""
+"\n"
+"  Prefix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3050
+msgid ""
+"\n"
+"  Given:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3051
+msgid ""
+"\n"
+"  Additional: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3052
+msgid ""
+"\n"
+"  Family:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3053
+msgid ""
+"\n"
+"  Suffix:     "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3067
+#, fuzzy
+msgid ""
+"\n"
+"Birth Date: "
+msgstr "Дата народження:"
+
+#: addressbook/backend/ebook/e-card.c:3078
+#, fuzzy
+msgid ""
+"\n"
+"Address:"
+msgstr "Адреса:"
+
+#: addressbook/backend/ebook/e-card.c:3080
+msgid ""
+"\n"
+"  Postal Box:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3081
+msgid ""
+"\n"
+"  Ext:         "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3082
+msgid ""
+"\n"
+"  Street:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3083
+msgid ""
+"\n"
+"  City:        "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3084
+msgid ""
+"\n"
+"  Region:      "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3085
+msgid ""
+"\n"
+"  Postal Code: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3086
+#, fuzzy
+msgid ""
+"\n"
+"  Country:     "
+msgstr "Кра╖на:"
+
+#: addressbook/backend/ebook/e-card.c:3099
+msgid ""
+"\n"
+"Delivery Label: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3111
+msgid ""
+"\n"
+"Telephones:\n"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3114
+msgid ""
+"\n"
+"Telephone:"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3138
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:\n"
+msgstr "Е-пошта 2"
+
+#: addressbook/backend/ebook/e-card.c:3141
+#, fuzzy
+msgid ""
+"\n"
+"E-mail:"
+msgstr "Е-пошта 2"
+
+#: addressbook/backend/ebook/e-card.c:3160
+msgid ""
+"\n"
+"Mailer: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3166
+msgid ""
+"\n"
+"Time Zone: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3174
+msgid ""
+"\n"
+"Geo Location: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3178
+#, fuzzy
+msgid ""
+"\n"
+"Business Role: "
+msgstr "Робоча 2"
+
+#: addressbook/backend/ebook/e-card.c:3190
+msgid ""
+"\n"
+"Org: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3191
+#, fuzzy
+msgid ""
+"\n"
+"  Name:  "
+msgstr "╤м'я:"
+
+#: addressbook/backend/ebook/e-card.c:3192
+msgid ""
+"\n"
+"  Unit:  "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3193
+msgid ""
+"\n"
+"  Unit2: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3194
+msgid ""
+"\n"
+"  Unit3: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3195
+msgid ""
+"\n"
+"  Unit4: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3199
+#, fuzzy
+msgid ""
+"\n"
+"Categories: "
+msgstr "категор╕╖"
+
+#: addressbook/backend/ebook/e-card.c:3200
+msgid ""
+"\n"
+"Comment: "
+msgstr ""
+
+#. if (crd->sound.prop.used) {
+#. if (crd->sound.type != SOUND_PHONETIC)
+#. addPropSizedValue (string, _ ("\nPronunciation: "),
+#. crd->sound.data, crd->sound.size);
+#. else
+#. add_strProp_to_string (string, _ ("\nPronunciation: "),
+#. crd->sound.data);
+#.
+#. add_SoundType (string, crd->sound.type);
+#. }
+#: addressbook/backend/ebook/e-card.c:3213
+msgid ""
+"\n"
+"Unique String: "
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:3216
+msgid ""
+"\n"
+"Public Key: "
+msgstr ""
+
 #: addressbook/backend/ebook/load-gnomecard-addressbook.c:16
 #: 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:1064
+#: addressbook/conduit/address-conduit.c:991
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1066
-#: calendar/conduits/todo/todo-conduit.c:946 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1136
+#: calendar/conduits/todo/todo-conduit.c:945 calendar/gui/main.c:54
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
@@ -139,26 +367,29 @@ msgid ""
 "pilot list from the gnome-pilot daemon"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:194
-#: addressbook/conduit/address-conduit.c:208
-msgid "BLARG\n"
+#: addressbook/conduit/address-conduit.c:197
+msgid "Cursor could not be loaded\n"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:638
-#: calendar/conduits/calendar/calendar-conduit.c:628
-#: calendar/conduits/todo/todo-conduit.c:507
+#: addressbook/conduit/address-conduit.c:210
+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
 msgid "Could not start wombat server"
 msgstr ""
 
-#: addressbook/conduit/address-conduit.c:639
-#: calendar/conduits/calendar/calendar-conduit.c:629
-#: calendar/conduits/todo/todo-conduit.c:508
+#: addressbook/conduit/address-conduit.c:584
+#: calendar/conduits/calendar/calendar-conduit.c:716
+#: calendar/conduits/todo/todo-conduit.c:524
 #, fuzzy
 msgid "Could not start wombat"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
-#: addressbook/conduit/address-conduit.c:665
-#: addressbook/conduit/address-conduit.c:668
+#: addressbook/conduit/address-conduit.c:616
+#: addressbook/conduit/address-conduit.c:619
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
@@ -179,113 +410,11 @@ msgstr ""
 msgid "Available Categories:"
 msgstr "Доступн╕ категор╕╖:"
 
-#: addressbook/contact-editor/e-contact-editor.c:1218
-msgid "Assistant"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1219
-#: addressbook/contact-editor/e-contact-editor.c:1323
-msgid "Business"
-msgstr "Робоча"
-
-#: addressbook/contact-editor/e-contact-editor.c:1220
-msgid "Business 2"
-msgstr "Робоча 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1221
-msgid "Business Fax"
-msgstr "Робочий факс"
-
-#: addressbook/contact-editor/e-contact-editor.c:1222
-msgid "Callback"
-msgstr ""
-
-#: addressbook/contact-editor/e-contact-editor.c:1223
-msgid "Car"
-msgstr "Авто"
-
-#: addressbook/contact-editor/e-contact-editor.c:1224
-msgid "Company"
-msgstr "Компан╕я"
-
-#: addressbook/contact-editor/e-contact-editor.c:1225
-#: addressbook/contact-editor/e-contact-editor.c:1324
-msgid "Home"
-msgstr "Домашня"
-
-#: addressbook/contact-editor/e-contact-editor.c:1226
-msgid "Home 2"
-msgstr "Домашня 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1227
-msgid "Home Fax"
-msgstr "Домашн╕й факс"
-
-#: addressbook/contact-editor/e-contact-editor.c:1228
-msgid "ISDN"
-msgstr "ISDN"
-
-#: addressbook/contact-editor/e-contact-editor.c:1229
-msgid "Mobile"
-msgstr "Моб╕льний"
-
-#: addressbook/contact-editor/e-contact-editor.c:1230
-#: addressbook/contact-editor/e-contact-editor.c:1325
-#: mail/mail-config.glade.h:28
-msgid "Other"
-msgstr "╤нша"
-
-#: addressbook/contact-editor/e-contact-editor.c:1231
-msgid "Other Fax"
-msgstr "╤нший факс"
-
-#: addressbook/contact-editor/e-contact-editor.c:1232
-msgid "Pager"
-msgstr "Пейджер"
-
-#: addressbook/contact-editor/e-contact-editor.c:1233
-msgid "Primary"
-msgstr "Первинний"
-
-#: addressbook/contact-editor/e-contact-editor.c:1234
-msgid "Radio"
-msgstr "Рад╕о"
-
-#: addressbook/contact-editor/e-contact-editor.c:1235
-msgid "Telex"
-msgstr "Телекс"
-
-#: addressbook/contact-editor/e-contact-editor.c:1236
-msgid "TTY/TDD"
-msgstr "TTY/TDD"
-
-#: addressbook/contact-editor/e-contact-editor-strings.h:22
-#: addressbook/contact-editor/e-contact-editor.c:1280
-msgid "Primary Email"
-msgstr "Первинна е-пошта"
-
-#: addressbook/contact-editor/e-contact-editor.c:1281
-msgid "Email 2"
-msgstr "Е-пошта 2"
-
-#: addressbook/contact-editor/e-contact-editor.c:1282
-msgid "Email 3"
-msgstr "Е-пошта 3"
-
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:7
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ви впевнен╕, що хочете\n"
-"стерти цю контактну ╕нформац╕ю?"
-
-#: addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h:9
+#: po/tmp/e-contact-editor-confirm-delete.glade.h:6
 msgid "Delete Contact?"
 msgstr "Стерти контактну ╕нформац╕ю?"
 
@@ -299,7 +428,7 @@ msgid "_Add"
 msgstr "Додати"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: ui/evolution-mail.h:31
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
 msgid "_Delete"
 msgstr "Стерти"
 
@@ -312,11 +441,13 @@ msgstr "Типи телефон╕в"
 msgid "New phone type"
 msgstr "Новий тип телефона"
 
+#.
+#. * 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
-#: calendar/gui/event-editor-dialog.glade.h:90 filter/filter.glade.h:12
-#: filter/filter.glade.h:17 filter/filter.glade.h:21 filter/filter.glade.h:24
-#: mail/mail-config.glade.h:11 mail/mail-config.glade.h:16
-#: mail/mail-config.glade.h:22
+#: po/tmp/event-editor-dialog.glade.h:7 po/tmp/filter.glade.h:6
+#: po/tmp/mail-config.glade.h:6
 msgid "Add"
 msgstr "Додати"
 
@@ -356,6 +487,11 @@ msgstr "Робочий факс:"
 msgid "_Mobile"
 msgstr "Моб╕льний телефон"
 
+#: addressbook/contact-editor/e-contact-editor-strings.h:22
+#: addressbook/contact-editor/e-contact-editor.c:1328
+msgid "Primary Email"
+msgstr "Первинна е-пошта"
+
 #: addressbook/contact-editor/e-contact-editor-strings.h:23
 msgid "B_usiness"
 msgstr ""
@@ -369,7 +505,7 @@ msgid "C_ontacts..."
 msgstr "Зв'язки..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:26
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:8
 msgid "Ca_tegories..."
 msgstr "Категор╕╖..."
 
@@ -386,7 +522,7 @@ msgid "_Address..."
 msgstr "Адреса..."
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:30
-#: calendar/gui/event-editor-dialog.glade.h:17
+#: po/tmp/event-editor-dialog.glade.h:15
 msgid "General"
 msgstr ""
 
@@ -431,59 +567,146 @@ msgid "No_tes:"
 msgstr "Нотатки:"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:41
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:31
+#: po/tmp/task-editor-dialog.glade.h:13
 msgid "Details"
 msgstr "Подробиц╕"
 
+#: addressbook/contact-editor/e-contact-editor.c:1266
+msgid "Assistant"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1267
+#: addressbook/contact-editor/e-contact-editor.c:1371
+msgid "Business"
+msgstr "Робоча"
+
+#: addressbook/contact-editor/e-contact-editor.c:1268
+msgid "Business 2"
+msgstr "Робоча 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1269
+msgid "Business Fax"
+msgstr "Робочий факс"
+
+#: addressbook/contact-editor/e-contact-editor.c:1270
+msgid "Callback"
+msgstr ""
+
+#: addressbook/contact-editor/e-contact-editor.c:1271
+msgid "Car"
+msgstr "Авто"
+
+#: addressbook/contact-editor/e-contact-editor.c:1272
+msgid "Company"
+msgstr "Компан╕я"
+
+#: addressbook/contact-editor/e-contact-editor.c:1273
+#: addressbook/contact-editor/e-contact-editor.c:1372
+msgid "Home"
+msgstr "Домашня"
+
+#: addressbook/contact-editor/e-contact-editor.c:1274
+msgid "Home 2"
+msgstr "Домашня 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1275
+msgid "Home Fax"
+msgstr "Домашн╕й факс"
+
+#: addressbook/contact-editor/e-contact-editor.c:1276
+msgid "ISDN"
+msgstr "ISDN"
+
+#: addressbook/contact-editor/e-contact-editor.c:1277
+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
+msgid "Other"
+msgstr "╤нша"
+
+#: addressbook/contact-editor/e-contact-editor.c:1279
+msgid "Other Fax"
+msgstr "╤нший факс"
+
+#: addressbook/contact-editor/e-contact-editor.c:1280
+msgid "Pager"
+msgstr "Пейджер"
+
+#: addressbook/contact-editor/e-contact-editor.c:1281
+msgid "Primary"
+msgstr "Первинний"
+
+#: addressbook/contact-editor/e-contact-editor.c:1282
+msgid "Radio"
+msgstr "Рад╕о"
+
+#: addressbook/contact-editor/e-contact-editor.c:1283
+msgid "Telex"
+msgstr "Телекс"
+
+#: addressbook/contact-editor/e-contact-editor.c:1284
+msgid "TTY/TDD"
+msgstr "TTY/TDD"
+
+#: addressbook/contact-editor/e-contact-editor.c:1329
+msgid "Email 2"
+msgstr "Е-пошта 2"
+
+#: addressbook/contact-editor/e-contact-editor.c:1330
+msgid "Email 3"
+msgstr "Е-пошта 3"
+
 #.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/contact-editor/fulladdr.glade.h:7
+#: po/tmp/fulladdr.glade.h:6
+msgid "Address _2:"
+msgstr "Адреса _2:"
+
+#: po/tmp/fulladdr.glade.h:7
+msgid "Canada"
+msgstr "Канада"
+
+#: po/tmp/fulladdr.glade.h:8
 msgid "Check Address"
 msgstr "Перев╕рка адреси"
 
-#: addressbook/contact-editor/fulladdr.glade.h:8
+#: po/tmp/fulladdr.glade.h:9
+msgid "Countr_y:"
+msgstr "Кра╖на:"
+
+#: po/tmp/fulladdr.glade.h:10
+msgid "Finland"
+msgstr "Ф╕нлянд╕я"
+
+#: po/tmp/fulladdr.glade.h:11
+msgid "USA"
+msgstr "США"
+
+#: po/tmp/fulladdr.glade.h:12
 msgid "_Address:"
 msgstr "Адреса:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:9
+#: po/tmp/fulladdr.glade.h:13
 msgid "_City:"
 msgstr "М╕сто:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:10
+#: po/tmp/fulladdr.glade.h:14
 msgid "_PO Box:"
 msgstr "А/С:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:11
-msgid "Address _2:"
-msgstr "Адреса _2:"
-
-#: addressbook/contact-editor/fulladdr.glade.h:12
+#: po/tmp/fulladdr.glade.h:15
 msgid "_State/Province:"
 msgstr "Штат/область:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:13
-msgid "USA"
-msgstr "США"
-
-#: addressbook/contact-editor/fulladdr.glade.h:14
-msgid "Canada"
-msgstr "Канада"
-
-#: addressbook/contact-editor/fulladdr.glade.h:15
-msgid "Finland"
-msgstr "Ф╕нлянд╕я"
-
-#: addressbook/contact-editor/fulladdr.glade.h:16
+#: po/tmp/fulladdr.glade.h:16
 msgid "_ZIP Code:"
 msgstr "╤ндекс:"
 
-#: addressbook/contact-editor/fulladdr.glade.h:17
-msgid "Countr_y:"
-msgstr "Кра╖на:"
-
 #.
 #. * Translatable strings file generated by Glade.
 #. * Add this file to your project's POTFILES.in.
@@ -536,19 +759,24 @@ msgstr "Пр╕звище:"
 msgid "_Suffix:"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:310
+#: addressbook/gui/component/addressbook.c:263
 msgid "As _Minicards"
 msgstr "Як _Minicards"
 
-#: addressbook/gui/component/addressbook.c:316 ui/evolution-addressbook.h:10
+#.
+#. * 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
 msgid "As _Table"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:444
+#: addressbook/gui/component/addressbook.c:386
 msgid "Unable to open addressbook"
 msgstr "Не вдалося в╕дкрити адресну книгу"
 
-#: addressbook/gui/component/addressbook.c:449
+#: addressbook/gui/component/addressbook.c:391
 msgid ""
 "We were unable to open this addressbook.  This either\n"
 "means you have entered an incorrect URI, or have tried\n"
@@ -557,10 +785,34 @@ msgid ""
 "correctness and reenter.  If not, you probably have\n"
 "attempted to access an LDAP server.  If you wish to be\n"
 "able to use LDAP, you'll need to download and install\n"
-"OpenLDAP and recompile and install evolution.\n"
+"OpenLDAP and recompile and install Evolution.\n"
+msgstr ""
+
+#: addressbook/gui/component/addressbook.c:501 mail/folder-browser.c:136
+#, fuzzy
+msgid "Show All"
+msgstr "Новий"
+
+#: addressbook/gui/component/addressbook.c:503 mail/folder-browser.c:138
+msgid "Advanced..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:584
+#: addressbook/gui/component/addressbook.c:533
+#, fuzzy
+msgid "Any field contains"
+msgstr "Т╕ло м╕стить"
+
+#: addressbook/gui/component/addressbook.c:534
+#, fuzzy
+msgid "Name contains"
+msgstr "Д╕╖"
+
+#: addressbook/gui/component/addressbook.c:535
+#, fuzzy
+msgid "Email contains"
+msgstr "Д╕╖"
+
+#: addressbook/gui/component/addressbook.c:621
 msgid "The URI that the Folder Browser will display"
 msgstr "URI теки, що буде в╕дображено переглядачем"
 
@@ -569,172 +821,169 @@ msgid "External Directories"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/ldap-server-dialog.glade.h:7
-#: composer/e-msg-composer-attachment.glade.h:9
+#: po/tmp/e-msg-composer-attachment.glade.h:7
+#: po/tmp/ldap-server-dialog.glade.h:6
 msgid "Description:"
 msgstr "Опис:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:8
+#: po/tmp/ldap-server-dialog.glade.h:7
 msgid "LDAP Server:"
 msgstr "Сервер LDAP:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:9
+#: po/tmp/ldap-server-dialog.glade.h:8
+msgid "Name:"
+msgstr "╤м'я:"
+
+#: po/tmp/ldap-server-dialog.glade.h:9
 msgid "Port Number:"
 msgstr "Номер порта:"
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:10
+#: po/tmp/ldap-server-dialog.glade.h:10
 msgid "Root DN:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-server-dialog.glade.h:11
-msgid "Name:"
-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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/component/select-names/select-names.glade.h:7
-msgid "Select Names"
-msgstr "Вибрати назви"
-
-#: addressbook/gui/component/select-names/select-names.glade.h:8
+#: po/tmp/select-names.glade.h:6
 msgid "Find..."
 msgstr "Шукати..."
 
-#: addressbook/gui/component/select-names/select-names.glade.h:9
+#: po/tmp/select-names.glade.h:7
+msgid "Message Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: po/tmp/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:10
-msgid "Message Recipients"
-msgstr "Адресати пов╕домлення"
+#: addressbook/gui/search/e-addressbook-search-dialog.c:147
+#: mail/mail-search-dialogue.c:104
+msgid "Search"
+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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/gui/widgets/alphabet.glade.h:7
-msgid "window2"
-msgstr "в╕кно2"
-
-#: addressbook/gui/widgets/alphabet.glade.h:8
+#: po/tmp/alphabet.glade.h:6
 msgid "123"
 msgstr "123"
 
-#: addressbook/gui/widgets/alphabet.glade.h:9
+#: po/tmp/alphabet.glade.h:7
 msgid "a"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:10
+#: po/tmp/alphabet.glade.h:8
 msgid "b"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:11
+#: po/tmp/alphabet.glade.h:9
 msgid "c"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:12
+#: po/tmp/alphabet.glade.h:10
 msgid "d"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:13
+#: po/tmp/alphabet.glade.h:11
 msgid "e"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:14
+#: po/tmp/alphabet.glade.h:12
 msgid "f"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:15
+#: po/tmp/alphabet.glade.h:13
 msgid "g"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:16
-#: calendar/cal-util/timeutil.c:100
+#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:17
+#: po/tmp/alphabet.glade.h:15
 msgid "i"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:18
+#: po/tmp/alphabet.glade.h:16
 msgid "j"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:19
+#: po/tmp/alphabet.glade.h:17
 msgid "k"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:20
+#: po/tmp/alphabet.glade.h:18
 msgid "l"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:21
+#: po/tmp/alphabet.glade.h:19
 msgid "m"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:22
+#: po/tmp/alphabet.glade.h:20
 msgid "n"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:23
+#: po/tmp/alphabet.glade.h:21
 msgid "o"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:24
+#: po/tmp/alphabet.glade.h:22
 msgid "p"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:25
+#: po/tmp/alphabet.glade.h:23
 msgid "q"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:26
+#: po/tmp/alphabet.glade.h:24
 msgid "r"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:27
+#: po/tmp/alphabet.glade.h:25
 msgid "s"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:28
+#: po/tmp/alphabet.glade.h:26
 msgid "t"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:29
+#: po/tmp/alphabet.glade.h:27
 msgid "u"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:30
+#: po/tmp/alphabet.glade.h:28
 msgid "v"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:31
+#: po/tmp/alphabet.glade.h:29
 msgid "w"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:32
+#: po/tmp/alphabet.glade.h:30
 msgid "x"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:33
+#: po/tmp/alphabet.glade.h:31
 msgid "y"
 msgstr ""
 
-#: addressbook/gui/widgets/alphabet.glade.h:34
+#: po/tmp/alphabet.glade.h:32
 msgid "z"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:414
-#: addressbook/gui/widgets/e-minicard.c:337
+#: addressbook/gui/widgets/e-addressbook-view.c:417
+#: addressbook/gui/widgets/e-minicard.c:338
 msgid "Save as VCard"
 msgstr "Зберегти як VCard"
 
@@ -751,198 +1000,187 @@ msgid ""
 "Double-click here to create a new Contact."
 msgstr ""
 
-#: addressbook/gui/search/e-addressbook-search-dialog.c:151
-#: mail/folder-browser.c:494
-msgid "Search"
-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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: addressbook/printing/e-contact-print.glade.h:7
-msgid "Page Setup:"
-msgstr "Параметри стор╕нки:"
-
-#: addressbook/printing/e-contact-print.glade.h:8
-msgid "Style name:"
-msgstr "Назва стилю:"
-
-#: addressbook/printing/e-contact-print.glade.h:9
-msgid "Preview:"
-msgstr "Перегляд:"
-
-#: addressbook/printing/e-contact-print.glade.h:10
-msgid "Options"
-msgstr "Параметри"
-
-#: addressbook/printing/e-contact-print.glade.h:11
-msgid "Include:"
-msgstr ""
-
-#: addressbook/printing/e-contact-print.glade.h:12
-msgid "Sections:"
+#: po/tmp/e-contact-print.glade.h:6
+msgid "10 pt. Tahoma"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:13
-msgid "Immediately follow each other"
+#: po/tmp/e-contact-print.glade.h:7
+msgid "8 pt. Tahoma"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:14
-msgid "Letter tabs on side"
+#: po/tmp/e-contact-print.glade.h:8
+msgid "Blank forms at end:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:15
-msgid "Headings for each letter"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:9
+msgid "Body"
+msgstr "Т╕ло"
 
-#: addressbook/printing/e-contact-print.glade.h:16
-msgid "Start on a new page"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:10
+msgid "Bottom:"
+msgstr "Внизу:"
 
-#: addressbook/printing/e-contact-print.glade.h:17
-msgid "Number of columns:"
-msgstr "К╕льк╕сть стовпчик╕в:"
+#: po/tmp/e-contact-print.glade.h:11
+msgid "Dimensions:"
+msgstr "Розм╕ри:"
 
-#: addressbook/printing/e-contact-print.glade.h:18
-msgid "Blank forms at end:"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:12
+msgid "Font..."
+msgstr "Шрифт..."
 
-#: addressbook/printing/e-contact-print.glade.h:19
+#: po/tmp/e-contact-print.glade.h:13
 msgid "Fonts"
 msgstr "Шрифти"
 
-#: addressbook/printing/e-contact-print.glade.h:20
-#: addressbook/printing/e-contact-print.glade.h:21
-#: addressbook/printing/e-contact-print.glade.h:51
-#: addressbook/printing/e-contact-print.glade.h:54
-msgid "Font..."
-msgstr "Шрифт..."
+#: po/tmp/e-contact-print.glade.h:14
+msgid "Footer:"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:15
+msgid "Format"
+msgstr "Формат"
+
+#: po/tmp/e-contact-print.glade.h:16
+msgid "Header"
+msgstr "Заголовок"
 
-#: addressbook/printing/e-contact-print.glade.h:22
+#: po/tmp/e-contact-print.glade.h:17
+msgid "Header/Footer"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:18
 msgid "Headings"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:23
-msgid "10 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:19
+msgid "Headings for each letter"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:24
-msgid "Body"
-msgstr "Т╕ло"
+#: po/tmp/e-contact-print.glade.h:20
+msgid "Height:"
+msgstr "Висота:"
 
-#: addressbook/printing/e-contact-print.glade.h:25
-msgid "8 pt. Tahoma"
+#: po/tmp/e-contact-print.glade.h:21
+msgid "Immediately follow each other"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:26
-msgid "Shading"
+#: po/tmp/e-contact-print.glade.h:22
+msgid "Include:"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:27
-msgid "Print using gray shading"
+#: po/tmp/e-contact-print.glade.h:23
+msgid "Landscape"
+msgstr "Альбомна"
+
+#: po/tmp/e-contact-print.glade.h:24
+msgid "Left:"
+msgstr "Л╕воруч:"
+
+#: po/tmp/e-contact-print.glade.h:25
+msgid "Letter tabs on side"
 msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:28
-msgid "Format"
-msgstr "Формат"
+#: po/tmp/e-contact-print.glade.h:26
+msgid "Margins"
+msgstr "Поля"
 
-#: addressbook/printing/e-contact-print.glade.h:29
-#: addressbook/printing/e-contact-print.glade.h:50
-msgid "Paper"
-msgstr "Пап╕р"
+#: po/tmp/e-contact-print.glade.h:27
+msgid "Number of columns:"
+msgstr "К╕льк╕сть стовпчик╕в:"
 
-#: addressbook/printing/e-contact-print.glade.h:30
-msgid "Type:"
-msgstr "Тип:"
+#: po/tmp/e-contact-print.glade.h:28
+msgid "Options"
+msgstr "Параметри"
 
-#: addressbook/printing/e-contact-print.glade.h:31
-#: addressbook/printing/e-contact-print.glade.h:43
-#: calendar/gui/event-editor-dialog.glade.h:80
-msgid "label26"
-msgstr "label26"
+#: po/tmp/e-contact-print.glade.h:29
+msgid "Orientation"
+msgstr "Ор╕╓нтац╕я"
 
-#: addressbook/printing/e-contact-print.glade.h:32
-#: addressbook/printing/e-contact-print.glade.h:44
-msgid "Dimensions:"
-msgstr "Розм╕ри:"
+#: po/tmp/e-contact-print.glade.h:30
+msgid "Page"
+msgstr "Стор╕нка"
 
-#: addressbook/printing/e-contact-print.glade.h:33
-#: addressbook/printing/e-contact-print.glade.h:45
-msgid "Width:"
-msgstr "Ширина:"
+#: po/tmp/e-contact-print.glade.h:31
+msgid "Page Setup:"
+msgstr "Параметри стор╕нки:"
 
-#: addressbook/printing/e-contact-print.glade.h:34
-#: addressbook/printing/e-contact-print.glade.h:46
-msgid "Height:"
-msgstr "Висота:"
+#: po/tmp/e-contact-print.glade.h:32
+msgid "Paper"
+msgstr "Пап╕р"
 
-#: addressbook/printing/e-contact-print.glade.h:35
+#: po/tmp/e-contact-print.glade.h:33
 msgid "Paper source:"
 msgstr "Джерело паперу:"
 
-#: addressbook/printing/e-contact-print.glade.h:36
-msgid "Margins"
-msgstr "Поля"
+#: po/tmp/e-contact-print.glade.h:34
+msgid "Portrait"
+msgstr "Книжна"
 
-#: addressbook/printing/e-contact-print.glade.h:37
-msgid "Top:"
-msgstr "Вгор╕:"
+#: po/tmp/e-contact-print.glade.h:35
+msgid "Preview:"
+msgstr "Перегляд:"
 
-#: addressbook/printing/e-contact-print.glade.h:38
-msgid "Bottom:"
-msgstr "Внизу:"
+#: po/tmp/e-contact-print.glade.h:36
+msgid "Print using gray shading"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:39
-msgid "Left:"
-msgstr "Л╕воруч:"
+#: po/tmp/e-contact-print.glade.h:37
+msgid "Reverse on even pages"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:40
+#: po/tmp/e-contact-print.glade.h:38
 msgid "Right:"
 msgstr "Праворуч:"
 
-#: addressbook/printing/e-contact-print.glade.h:41
-msgid "Page"
-msgstr "Стор╕нка"
+#: po/tmp/e-contact-print.glade.h:39
+msgid "Sections:"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:42
+#: po/tmp/e-contact-print.glade.h:40
+msgid "Shading"
+msgstr ""
+
+#: po/tmp/e-contact-print.glade.h:41
 msgid "Size:"
 msgstr "Розм╕р:"
 
-#: addressbook/printing/e-contact-print.glade.h:47
-msgid "Orientation"
-msgstr "Ор╕╓нтац╕я"
-
-#: addressbook/printing/e-contact-print.glade.h:48
-msgid "Portrait"
-msgstr "Книжна"
+#: po/tmp/e-contact-print.glade.h:42
+msgid "Start on a new page"
+msgstr ""
 
-#: addressbook/printing/e-contact-print.glade.h:49
-msgid "Landscape"
-msgstr "Альбомна"
+#: po/tmp/e-contact-print.glade.h:43
+msgid "Style name:"
+msgstr "Назва стилю:"
 
-#: addressbook/printing/e-contact-print.glade.h:52
-msgid "Header"
-msgstr "Заголовок"
+#: po/tmp/e-contact-print.glade.h:44
+msgid "Top:"
+msgstr "Вгор╕:"
 
-#: addressbook/printing/e-contact-print.glade.h:53
-msgid "Footer:"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:45
+msgid "Type:"
+msgstr "Тип:"
 
-#: addressbook/printing/e-contact-print.glade.h:55
-msgid "Reverse on even pages"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:46
+msgid "Width:"
+msgstr "Ширина:"
 
-#: addressbook/printing/e-contact-print.glade.h:56
-msgid "Header/Footer"
-msgstr ""
+#: po/tmp/e-contact-print.glade.h:47
+msgid "label26"
+msgstr "label26"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:605
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "дп"
 
-#: calendar/cal-util/timeutil.c:98 calendar/gui/print.c:604
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "пп"
 
@@ -954,13 +1192,13 @@ msgstr ""
 msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:584
-#: calendar/conduits/todo/todo-conduit.c:463
+#: calendar/conduits/calendar/calendar-conduit.c:671
+#: calendar/conduits/todo/todo-conduit.c:479
 msgid "Error while communicating with calendar server"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:682
-#: calendar/conduits/calendar/calendar-conduit.c:685
+#: calendar/conduits/calendar/calendar-conduit.c:770
+#: calendar/conduits/calendar/calendar-conduit.c:773
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 
@@ -972,8 +1210,8 @@ msgstr ""
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr ""
 
-#: calendar/conduits/todo/todo-conduit.c:561
-#: calendar/conduits/todo/todo-conduit.c:564
+#: calendar/conduits/todo/todo-conduit.c:578
+#: calendar/conduits/todo/todo-conduit.c:581
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
@@ -1017,49 +1255,46 @@ msgstr ""
 msgid "To-Do item that is overdue:"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:386
+#: calendar/gui/calendar-commands.c:354
 msgid "File not found"
 msgstr "Файлу не знайдено"
 
-#: calendar/gui/calendar-commands.c:410
+#: calendar/gui/calendar-commands.c:378
 msgid "Open calendar"
 msgstr "В╕дкрити календар"
 
-#: calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:417
 msgid "Save calendar"
 msgstr "Зберегти календар"
 
 #. strftime format of a weekday and a date.
 #: calendar/gui/calendar-model.c:282
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
-#: widgets/meeting-time-sel/e-meeting-time-sel.c:2495
+#: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 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:726
+#: calendar/gui/calendar-model.c:286 calendar/gui/calendar-model.c:736
 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:729
+#: calendar/gui/calendar-model.c:290 calendar/gui/calendar-model.c:739
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:344
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:23
+#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:347
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:24
+#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:350
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr ""
 
@@ -1091,7 +1326,7 @@ msgstr ""
 msgid "Opaque"
 msgstr ""
 
-#: calendar/gui/calendar-model.c:734
+#: calendar/gui/calendar-model.c:744
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1103,36 +1338,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:835 calendar/gui/calendar-model.c:883
+#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:480 widgets/misc/e-dateedit.c:512
-#: widgets/misc/e-dateedit.c:669 widgets/misc/e-dateedit.c:725
+#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
 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:853
+#: calendar/gui/calendar-model.c:863
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:856
+#: calendar/gui/calendar-model.c:866
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:860
+#: calendar/gui/calendar-model.c:870
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:863
+#: calendar/gui/calendar-model.c:873
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:983
+#: calendar/gui/calendar-model.c:993
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1142,15 +1376,15 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1023
+#: calendar/gui/calendar-model.c:1033
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Значення в╕дсотка ма╓ бути м╕ж 0 та 100, включно"
 
-#: calendar/gui/calendar-model.c:1063
+#: calendar/gui/calendar-model.c:1073
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "Значення пр╕оритету ма╓ бути м╕ж 1 та 9, включно"
 
-#: calendar/gui/control-factory.c:126
+#: calendar/gui/control-factory.c:125
 msgid "The URI that the calendar will display"
 msgstr "URI, який в╕добразить календар"
 
@@ -1167,475 +1401,459 @@ msgid "No summary available."
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/alarm-notify.glade.h:7
-#: ui/evolution-contact-editor.h:14 ui/evolution-subscribe.h:10
+#: 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
 msgid "Close"
 msgstr "Закрити"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:8 calendar/gui/gnome-cal.c:1458
-msgid "Snooze"
-msgstr "Сон"
-
-#: calendar/gui/dialogs/alarm-notify.glade.h:9
+#: po/tmp/alarm-notify.glade.h:7
 msgid "Edit appointment"
 msgstr "Виправити зустр╕ч"
 
-#: calendar/gui/dialogs/alarm-notify.glade.h:10
+#: calendar/gui/gnome-cal.c:1466 po/tmp/alarm-notify.glade.h:8
+msgid "Snooze"
+msgstr "Сон"
+
+#: po/tmp/alarm-notify.glade.h:9
 msgid "Snooze time (minutes)"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
-msgid "Calendar Preferences"
-msgstr "Параметри календаря"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-msgid "Work week"
-msgstr "Робочий тиждень"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: calendar/gui/event-editor-dialog.glade.h:53
-#: calendar/gui/gnome-month-item.c:737
-msgid "Mon"
-msgstr "Пнд"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: calendar/gui/event-editor-dialog.glade.h:54
-#: calendar/gui/gnome-month-item.c:738
-msgid "Tue"
-msgstr "Втр"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: calendar/gui/event-editor-dialog.glade.h:55
-#: calendar/gui/gnome-month-item.c:739
-msgid "Wed"
-msgstr "Срд"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-#: calendar/gui/event-editor-dialog.glade.h:56
-#: calendar/gui/gnome-month-item.c:740
-msgid "Thu"
-msgstr "Чтв"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-#: calendar/gui/event-editor-dialog.glade.h:57
-#: calendar/gui/gnome-month-item.c:741
-msgid "Fri"
-msgstr "Птн"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/event-editor-dialog.glade.h:58
-#: calendar/gui/gnome-month-item.c:742
-msgid "Sat"
-msgstr "Сбт"
-
-#. Initialize by default to three-letter day names
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-#: calendar/gui/event-editor-dialog.glade.h:59
-#: calendar/gui/gnome-month-item.c:736
-msgid "Sun"
-msgstr "Ндл"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-msgid "First day of week:"
-msgstr "Перший день тижня:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17 calendar/gui/prop.c:354
-msgid "Monday"
-msgstr "Понед╕лок"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-msgid "Tuesday"
-msgstr "В╕второк"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-msgid "Wednesday"
-msgstr "Середа"
+#: po/tmp/cal-prefs-dialog.glade.h:6
+msgid "05 minutes"
+msgstr "05 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-msgid "Thursday"
-msgstr "Четвер"
+#: po/tmp/cal-prefs-dialog.glade.h:7
+msgid "10 minutes"
+msgstr "10 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-msgid "Friday"
-msgstr "П'ятниця"
+#: po/tmp/cal-prefs-dialog.glade.h:8
+msgid "12 hour (am/pm)"
+msgstr "12 годин (дп/пп)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid "Saturday"
-msgstr "Субота"
+#: po/tmp/cal-prefs-dialog.glade.h:9
+msgid "15 minutes"
+msgstr "15 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23 calendar/gui/prop.c:353
-msgid "Sunday"
-msgstr "Нед╕ля"
+#: po/tmp/cal-prefs-dialog.glade.h:10
+msgid "24 hour"
+msgstr "24 години"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Start of day:"
-msgstr "Початок дня:"
+#: po/tmp/cal-prefs-dialog.glade.h:11
+msgid "30 minutes"
+msgstr "30 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-msgid "End of day:"
-msgstr "К╕нець дня:"
+#: po/tmp/cal-prefs-dialog.glade.h:12
+msgid "60 minutes"
+msgstr "60 хвилин"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Display options"
+#: po/tmp/cal-prefs-dialog.glade.h:13
+msgid "Alarms timeout after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
-msgid "Time divisions:"
-msgstr "Розд╕лювач╕ часу:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-msgid "Time format:"
-msgstr "Формат часу:"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-msgid "Show appointment end times"
+#: po/tmp/cal-prefs-dialog.glade.h:14
+msgid "Audio Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-msgid "Compress weekends"
+#: po/tmp/cal-prefs-dialog.glade.h:15
+msgid "Beep when alarm windows appear."
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-msgid "12 hour (am/pm)"
-msgstr "12 годин (дп/пп)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "24 hour"
-msgstr "24 години"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-msgid "60 minutes"
-msgstr "60 хвилин"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-msgid "30 minutes"
-msgstr "30 хвилин"
+#: po/tmp/cal-prefs-dialog.glade.h:16
+msgid "Calendar"
+msgstr "Календар"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-msgid "15 minutes"
-msgstr "15 хвилин"
+#: po/tmp/cal-prefs-dialog.glade.h:17
+msgid "Calendar Preferences"
+msgstr "Параметри календаря"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-msgid "10 minutes"
-msgstr "10 хвилин"
+#: po/tmp/cal-prefs-dialog.glade.h:18
+msgid "Colors"
+msgstr "Кольори"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-msgid "05 minutes"
-msgstr "05 хвилин"
+#: po/tmp/cal-prefs-dialog.glade.h:19
+msgid "Compress weekends"
+msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: po/tmp/cal-prefs-dialog.glade.h:20
 msgid "Date navigator options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-msgid "Show week numbers"
+#: po/tmp/cal-prefs-dialog.glade.h:21
+msgid "Defaults"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "Calendar"
-msgstr "Календар"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-msgid "Show"
+#: po/tmp/cal-prefs-dialog.glade.h:22
+msgid "Display options"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42 calendar/gui/prop.c:610
+#: po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43 calendar/gui/prop.c:612
-msgid "Time Until Due"
+#: po/tmp/cal-prefs-dialog.glade.h:24
+msgid "Enable snoozing for"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 calendar/gui/prop.c:611
-#: filter/libfilter-i18n.h:14
-msgid "Priority"
-msgstr "Пр╕оритет"
+#: po/tmp/cal-prefs-dialog.glade.h:25
+msgid "End of day:"
+msgstr "К╕нець дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "Highlight"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:26
+msgid "First day of week:"
+msgstr "Перший день тижня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-msgid "Overdue Items"
+#: calendar/gui/gnome-month-item.c:741 po/tmp/cal-prefs-dialog.glade.h:27
+msgid "Fri"
+msgstr "Птн"
+
+#: calendar/gui/event-editor.c:437 po/tmp/cal-prefs-dialog.glade.h:28
+msgid "Friday"
+msgstr "П'ятниця"
+
+#: po/tmp/cal-prefs-dialog.glade.h:29
+msgid "Highlight"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: po/tmp/cal-prefs-dialog.glade.h:30
 msgid "Items Due Today"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-msgid "Items Not Yet Due"
+#: po/tmp/cal-prefs-dialog.glade.h:31
+msgid "Items Due Today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49 calendar/gui/prop.c:528
-msgid "Colors"
-msgstr "Кольори"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-msgid "Pick a color"
+#: po/tmp/cal-prefs-dialog.glade.h:32
+msgid "Items Not Yet Due"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: po/tmp/cal-prefs-dialog.glade.h:33
 msgid "Items Not Yet Due:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-msgid "Items Due Today:"
+#: calendar/gui/gnome-month-item.c:737 po/tmp/cal-prefs-dialog.glade.h:34
+msgid "Mon"
+msgstr "Пнд"
+
+#: calendar/gui/event-editor.c:433 po/tmp/cal-prefs-dialog.glade.h:35
+msgid "Monday"
+msgstr "Понед╕лок"
+
+#: po/tmp/cal-prefs-dialog.glade.h:36
+msgid "Overdue Items"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: po/tmp/cal-prefs-dialog.glade.h:37
 msgid "Overdue Items:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
-msgid "TaskPad"
+#: po/tmp/cal-prefs-dialog.glade.h:38
+msgid "Pick a color"
 msgstr ""
 
-#. populate default frame/box
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:57 calendar/gui/prop.c:842
-msgid "Defaults"
-msgstr ""
+#: filter/libfilter-i18n.h:15 po/tmp/cal-prefs-dialog.glade.h:39
+msgid "Priority"
+msgstr "Пр╕оритет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: po/tmp/cal-prefs-dialog.glade.h:40
 msgid "Remind me of all appointments"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
-msgid "minutes before they occur."
+#: po/tmp/cal-prefs-dialog.glade.h:41
+msgid "Reminders"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
-msgid "Visual Alarms"
-msgstr ""
+#: calendar/gui/gnome-month-item.c:742 po/tmp/cal-prefs-dialog.glade.h:42
+msgid "Sat"
+msgstr "Сбт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
-msgid "Beep when alarm windows appear."
-msgstr ""
+#: calendar/gui/event-editor.c:438 po/tmp/cal-prefs-dialog.glade.h:43
+msgid "Saturday"
+msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
-msgid "Audio Alarms"
+#: po/tmp/cal-prefs-dialog.glade.h:44
+msgid "Show"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
-msgid "Alarms timeout after"
+#: po/tmp/cal-prefs-dialog.glade.h:45
+msgid "Show appointment end times"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
-msgid "seconds."
+#: po/tmp/cal-prefs-dialog.glade.h:46
+msgid "Show week numbers"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
-msgid "Enable snoozing for"
-msgstr ""
+#: po/tmp/cal-prefs-dialog.glade.h:47
+msgid "Start of day:"
+msgstr "Початок дня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
-msgid "Reminders"
+#. Initialize by default to three-letter day names
+#: calendar/gui/gnome-month-item.c:736 po/tmp/cal-prefs-dialog.glade.h:48
+msgid "Sun"
+msgstr "Ндл"
+
+#: calendar/gui/event-editor.c:439 po/tmp/cal-prefs-dialog.glade.h:49
+msgid "Sunday"
+msgstr "Нед╕ля"
+
+#: po/tmp/cal-prefs-dialog.glade.h:50
+msgid "TaskPad"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:657
-msgid "Edit Task"
-msgstr "Виправити завдання"
+#: calendar/gui/gnome-month-item.c:740 po/tmp/cal-prefs-dialog.glade.h:51
+msgid "Thu"
+msgstr "Чтв"
 
-#: calendar/gui/dialogs/task-editor.c:663 calendar/gui/event-editor.c:285
-msgid "No summary"
+#: calendar/gui/event-editor.c:436 po/tmp/cal-prefs-dialog.glade.h:52
+msgid "Thursday"
+msgstr "Четвер"
+
+#: po/tmp/cal-prefs-dialog.glade.h:53
+msgid "Time Until Due"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor.c:669 calendar/gui/event-editor.c:291
-#, c-format
-msgid "Appointment - %s"
-msgstr "Зустр╕ч - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:54
+msgid "Time divisions:"
+msgstr "Розд╕лювач╕ часу:"
 
-#: calendar/gui/dialogs/task-editor.c:672 calendar/gui/event-editor.c:294
-#, c-format
-msgid "Task - %s"
-msgstr "Завдання - %s"
+#: po/tmp/cal-prefs-dialog.glade.h:55
+msgid "Time format:"
+msgstr "Формат часу:"
 
-#: calendar/gui/dialogs/task-editor.c:675 calendar/gui/event-editor.c:297
-#, c-format
-msgid "Journal entry - %s"
-msgstr "Журнальний рядок - %s"
+#: calendar/gui/gnome-month-item.c:738 po/tmp/cal-prefs-dialog.glade.h:56
+msgid "Tue"
+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.
-#.
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:7
-msgid "task-editor-dialog"
-msgstr ""
+#: calendar/gui/event-editor.c:434 po/tmp/cal-prefs-dialog.glade.h:57
+msgid "Tuesday"
+msgstr "В╕второк"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:8
-msgid "S_ummary"
+#: po/tmp/cal-prefs-dialog.glade.h:58
+msgid "Visual Alarms"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:9
-msgid "Sta_rt Date:"
+#: calendar/gui/gnome-month-item.c:739 po/tmp/cal-prefs-dialog.glade.h:59
+msgid "Wed"
+msgstr "Срд"
+
+#: calendar/gui/event-editor.c:435 po/tmp/cal-prefs-dialog.glade.h:60
+msgid "Wednesday"
+msgstr "Середа"
+
+#: po/tmp/cal-prefs-dialog.glade.h:61
+msgid "Work week"
+msgstr "Робочий тиждень"
+
+#: po/tmp/cal-prefs-dialog.glade.h:62
+msgid "minutes before they occur."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:10
-msgid "_Due Date:"
+#: po/tmp/cal-prefs-dialog.glade.h:63
+msgid "seconds."
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:11
+#.
+#. * 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
 msgid "% Comp_lete:"
 msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:12
-msgid "_Status:"
-msgstr "Стан:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:13
-msgid "Not Started"
-msgstr "Не розпочато"
+#: po/tmp/task-editor-dialog.glade.h:7
+msgid "C_lassification:"
+msgstr "Класиф╕кац╕я:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:14
-msgid "In Progress"
-msgstr "Викону╓ться"
+#: po/tmp/task-editor-dialog.glade.h:9
+msgid "Cancelled"
+msgstr "В╕дм╕нено"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:15
+#: po/tmp/task-editor-dialog.glade.h:10
 msgid "Completed"
 msgstr "Завершено"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:16
-msgid "Cancelled"
-msgstr "В╕дм╕нено"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:17
-msgid "_Priority:"
-msgstr "Пр╕оритет:"
+#: po/tmp/task-editor-dialog.glade.h:12
+msgid "Date Completed:"
+msgstr "Дата виконання:"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:18
+#: po/tmp/task-editor-dialog.glade.h:14
 msgid "High"
 msgstr "Високий"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:19
-msgid "Normal"
-msgstr "Звичайний"
+#: po/tmp/task-editor-dialog.glade.h:15
+msgid "In Progress"
+msgstr "Викону╓ться"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:20
+#: po/tmp/task-editor-dialog.glade.h:16
 msgid "Low"
 msgstr "Низький"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:21
-msgid "C_lassification:"
-msgstr "Класиф╕кац╕я:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:42 shell/e-shell-view.c:989
-#: widgets/misc/e-dateedit.c:337 widgets/misc/e-dateedit.c:709
-#: widgets/misc/e-dateedit.c:1171
+#. 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
 msgid "None"
 msgstr "Нема╓"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:26
-msgid "_Contacts..."
-msgstr "Зв'язки..."
+#: po/tmp/task-editor-dialog.glade.h:18
+msgid "Normal"
+msgstr "Звичайний"
+
+#: po/tmp/task-editor-dialog.glade.h:19
+msgid "Not Started"
+msgstr "Не розпочато"
+
+#: po/tmp/task-editor-dialog.glade.h:22
+msgid "S_ummary"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:23
+msgid "Sta_rt Date:"
+msgstr ""
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:24
 msgid "Task"
 msgstr "Завдання"
 
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:29
-msgid "Date Completed:"
-msgstr "Дата виконання:"
-
-#: calendar/gui/dialogs/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:25
 msgid "URL:"
 msgstr "URL:"
 
-#: calendar/gui/e-calendar-table.c:294
+#: po/tmp/task-editor-dialog.glade.h:26
+msgid "_Contacts..."
+msgstr "Зв'язки..."
+
+#: po/tmp/task-editor-dialog.glade.h:27
+msgid "_Due Date:"
+msgstr ""
+
+#: po/tmp/task-editor-dialog.glade.h:28
+msgid "_Priority:"
+msgstr "Пр╕оритет:"
+
+#: po/tmp/task-editor-dialog.glade.h:29
+msgid "_Status:"
+msgstr "Стан:"
+
+#: po/tmp/task-editor-dialog.glade.h:30
+msgid "task-editor-dialog"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:681
+msgid "Edit Task"
+msgstr "Виправити завдання"
+
+#: calendar/gui/dialogs/task-editor.c:687 calendar/gui/event-editor.c:335
+msgid "No summary"
+msgstr ""
+
+#: calendar/gui/dialogs/task-editor.c:693 calendar/gui/event-editor.c:341
+#, c-format
+msgid "Appointment - %s"
+msgstr "Зустр╕ч - %s"
+
+#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:344
+#, c-format
+msgid "Task - %s"
+msgstr "Завдання - %s"
+
+#: calendar/gui/dialogs/task-editor.c:699 calendar/gui/event-editor.c:347
+#, c-format
+msgid "Journal entry - %s"
+msgstr "Журнальний рядок - %s"
+
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+msgid "Do you want to save changes?"
+msgstr ""
+
+#: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
 msgstr "В╕дкрити..."
 
-#: calendar/gui/e-calendar-table.c:295
+#: calendar/gui/e-calendar-table.c:337
 msgid "Open the task"
 msgstr "В╕дкрити завдання"
 
-#: calendar/gui/e-calendar-table.c:297
+#: calendar/gui/e-calendar-table.c:339
 msgid "Mark Complete"
 msgstr "Позначити як виконане"
 
-#: calendar/gui/e-calendar-table.c:298
+#: calendar/gui/e-calendar-table.c:340
 msgid "Mark the task complete"
 msgstr "Позначити завдання як виконане"
 
-#: calendar/gui/e-calendar-table.c:300
-#: calendar/gui/event-editor-dialog.glade.h:92 filter/filter.glade.h:14
-#: filter/filter.glade.h:19 filter/libfilter-i18n.h:7
-#: mail/mail-config.glade.h:13 mail/mail-config.glade.h:18
-#: mail/mail-config.glade.h:24 mail/mail-view.c:163
-#: ui/evolution-addressbook.h:20 ui/evolution-contact-editor.h:12
-#: ui/evolution-contact-editor.h:19 ui/evolution-mail.h:59
+#: 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:301
+#: calendar/gui/e-calendar-table.c:343
 msgid "Delete the task"
 msgstr "Стерти завдання"
 
-#: calendar/gui/e-day-view-time-item.c:406
+#: calendar/gui/e-day-view-time-item.c:516
 #, c-format
 msgid "%02i minute divisions"
 msgstr ""
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1172
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1208
 #: 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:1186
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1222
 #: 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:1199
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1235
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d %b"
 
-#: calendar/gui/e-day-view.c:2634 calendar/gui/e-day-view.c:2641
-#: calendar/gui/e-day-view.c:2650 calendar/gui/e-week-view.c:2932
-#: calendar/gui/e-week-view.c:2939 calendar/gui/e-week-view.c:2948
+#: 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
 msgid "New appointment..."
 msgstr "Нова зустр╕ч..."
 
-#: calendar/gui/e-day-view.c:2638 calendar/gui/e-day-view.c:2645
-#: calendar/gui/e-week-view.c:2936 calendar/gui/e-week-view.c:2943
+#: 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
 msgid "Edit this appointment..."
 msgstr "Виправити зустр╕ч..."
 
-#: calendar/gui/e-day-view.c:2639 calendar/gui/e-week-view.c:2937
+#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Стерти цю зустр╕ч"
 
-#: calendar/gui/e-day-view.c:2646 calendar/gui/e-week-view.c:2944
+#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
 msgid "Make this appointment movable"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2647 calendar/gui/e-week-view.c:2945
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
 msgid "Delete this occurrence"
 msgstr ""
 
-#: calendar/gui/e-day-view.c:2648 calendar/gui/e-week-view.c:2946
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
 msgid "Delete all occurrences"
 msgstr ""
 
@@ -1646,245 +1864,214 @@ msgstr ""
 msgid "%d %B"
 msgstr "%d %B"
 
-#: calendar/gui/event-editor.c:279
-msgid "Edit Appointment"
-msgstr "Виправити зустр╕ч"
-
-#: calendar/gui/event-editor.c:1749 calendar/gui/print.c:1085
-#: calendar/gui/print.c:1087 calendar/gui/print.c:1088
-msgid "%a %b %d %Y"
-msgstr ""
-
-#. todo
-#.
-#. build some of the recur stuff by hand to take into account
-#. the start-on-monday preference?
-#.
-#. get the apply button to work right
-#.
-#. make the properties stuff unglobal
 #.
-#. figure out why alarm units aren't sticking between edits
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#. closing the dialog window with the wm caused a crash
-#. Gtk-WARNING **: invalid cast from `(unknown)' to `GnomeDialog'
-#. on line 669:  gnome_dialog_close (GNOME_DIALOG(dialog->dialog));
-#.
-#.
-#. * Translatable strings file generated by Glade.
-#. * Add this file to your project's POTFILES.in.
-#. * DO NOT compile it as part of your application.
-#.
-#: calendar/gui/event-editor-dialog.glade.h:7
-msgid "event-editor-dialog"
+#: po/tmp/event-editor-dialog.glade.h:6
+msgid "A_ll day event"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:8
-msgid "_Summary:"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:8
+#, fuzzy
+msgid "Appointment Basics"
+msgstr "Зустр╕ч╕:"
 
-#: calendar/gui/event-editor-dialog.glade.h:9
-msgid "Time"
-msgstr "Час"
+#: po/tmp/event-editor-dialog.glade.h:9
+msgid "Classification"
+msgstr "Класиф╕кац╕я"
 
-#: calendar/gui/event-editor-dialog.glade.h:10
-msgid "Start time:"
+#: po/tmp/event-editor-dialog.glade.h:10
+msgid "Custom recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:11
-msgid "End time:"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:11
+#, fuzzy
+msgid "Days"
+msgstr "День"
 
-#: calendar/gui/event-editor-dialog.glade.h:12
-msgid "A_ll day event"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:13
+msgid "Every"
+msgstr "Кожен"
 
-#: calendar/gui/event-editor-dialog.glade.h:13
-msgid "Classification"
-msgstr "Класиф╕кац╕я"
+#: po/tmp/event-editor-dialog.glade.h:14
+#, fuzzy
+msgid "Exceptions"
+msgstr "Виключення"
 
-#: calendar/gui/event-editor-dialog.glade.h:14
-msgid "Pu_blic"
+#: po/tmp/event-editor-dialog.glade.h:16
+#, fuzzy
+msgid "Hours"
+msgstr "година"
+
+#: po/tmp/event-editor-dialog.glade.h:17
+msgid "Mail _to:"
+msgstr "Лист до:"
+
+#: po/tmp/event-editor-dialog.glade.h:18
+#, fuzzy
+msgid "Minutes"
+msgstr "хвилина"
+
+#: po/tmp/event-editor-dialog.glade.h:19
+#, fuzzy
+msgid "Modify"
+msgstr "Понед╕лок"
+
+#: po/tmp/event-editor-dialog.glade.h:20
+msgid "No recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:15
+#: po/tmp/event-editor-dialog.glade.h:21
+#, fuzzy
+msgid "Preview"
+msgstr "Перегляд:"
+
+#: po/tmp/event-editor-dialog.glade.h:22
 msgid "Pri_vate"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:16
-msgid "_Confidential"
+#: po/tmp/event-editor-dialog.glade.h:23
+msgid "Pu_blic"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/event-editor-dialog.glade.h:22
-#: calendar/gui/event-editor-dialog.glade.h:26
-#: calendar/gui/event-editor-dialog.glade.h:30
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days\n"
+#: po/tmp/event-editor-dialog.glade.h:24
+msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:34
-msgid "_Display"
+#: po/tmp/event-editor-dialog.glade.h:25
+msgid "Recurrence Rule"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:35
-msgid "_Audio"
-msgstr "Ауд╕о"
+#: po/tmp/event-editor-dialog.glade.h:26
+msgid "Reminder"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:36
-msgid "_Program"
-msgstr "Програма"
+#: po/tmp/event-editor-dialog.glade.h:27
+msgid "Simple recurrence"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:37
-msgid "_Mail"
-msgstr "Пошта"
+#: po/tmp/event-editor-dialog.glade.h:28
+msgid "Su_mmary:"
+msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:38
-msgid "Mail _to:"
-msgstr "Лист до:"
+#: po/tmp/event-editor-dialog.glade.h:29
+msgid "Time"
+msgstr "Час"
 
-#: calendar/gui/event-editor-dialog.glade.h:39
-msgid "_Run program:"
-msgstr "Запустити програму:"
+#: po/tmp/event-editor-dialog.glade.h:30
+msgid "_Audio"
+msgstr "Ауд╕о"
 
-#: calendar/gui/event-editor-dialog.glade.h:40
-msgid "Reminder"
+#: po/tmp/event-editor-dialog.glade.h:31
+msgid "_Confidential"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:41
-msgid "Recurrence rule"
+#: po/tmp/event-editor-dialog.glade.h:32
+msgid "_Display"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:43
-msgid "Daily"
-msgstr "Щодня"
+#: po/tmp/event-editor-dialog.glade.h:33
+#, fuzzy
+msgid "_End time:"
+msgstr "Час завершення з╕брання:"
 
-#: calendar/gui/event-editor-dialog.glade.h:44
-msgid "Weekly"
-msgstr "Щотижня"
+#: po/tmp/event-editor-dialog.glade.h:34
+msgid "_Mail"
+msgstr "Пошта"
 
-#: calendar/gui/event-editor-dialog.glade.h:45
-msgid "Monthly"
-msgstr "Щом╕сяця"
+#: po/tmp/event-editor-dialog.glade.h:35
+msgid "_Program"
+msgstr "Програма"
+
+#: po/tmp/event-editor-dialog.glade.h:36
+msgid "_Run program:"
+msgstr "Запустити програму:"
 
-#: calendar/gui/event-editor-dialog.glade.h:46
-msgid "Yearly"
-msgstr "Щороку"
+#: po/tmp/event-editor-dialog.glade.h:37
+#, fuzzy
+msgid "_Start time:"
+msgstr "Час початку з╕брання:"
 
-#: calendar/gui/event-editor-dialog.glade.h:47
-msgid "label23"
-msgstr "позначка23"
+#: po/tmp/event-editor-dialog.glade.h:38
+#, fuzzy
+msgid "_Starting date:"
+msgstr "Початок дня:"
 
-#: calendar/gui/event-editor-dialog.glade.h:48
-#: calendar/gui/event-editor-dialog.glade.h:51
-#: calendar/gui/event-editor-dialog.glade.h:81
-msgid "Every "
+#: po/tmp/event-editor-dialog.glade.h:39
+msgid "day(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:49
-msgid "day(s)"
+#: po/tmp/event-editor-dialog.glade.h:40
+msgid "event-editor-dialog"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:50
-msgid "label24"
-msgstr "позначка24"
+#: po/tmp/event-editor-dialog.glade.h:41
+#, fuzzy
+msgid "for"
+msgstr "четвертий"
 
-#: calendar/gui/event-editor-dialog.glade.h:52
-msgid "week(s)"
+#: po/tmp/event-editor-dialog.glade.h:42
+msgid "forever"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:60
-msgid "label25"
-msgstr "позначка25"
+#: po/tmp/event-editor-dialog.glade.h:43
+#, fuzzy
+msgid "label21"
+msgstr "label26"
 
-#: calendar/gui/event-editor-dialog.glade.h:61
-#: calendar/gui/event-editor-dialog.glade.h:62
-msgid "Recur on the"
-msgstr ""
+#: po/tmp/event-editor-dialog.glade.h:44
+msgid "month(s)"
+msgstr "м╕сяць"
 
-#: calendar/gui/event-editor-dialog.glade.h:63
-msgid "th day of the month"
+#: po/tmp/event-editor-dialog.glade.h:45
+msgid "until"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:64
-msgid ""
-"1st\n"
-"2nd\n"
-"3rd\n"
-"4th\n"
-"5th\n"
+#: po/tmp/event-editor-dialog.glade.h:46
+msgid "week(s)"
 msgstr ""
 
-#: calendar/gui/event-editor-dialog.glade.h:70
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday\n"
-msgstr ""
-"Понед╕лок\n"
-"В╕второк\n"
-"Середа\n"
-"Четвер\n"
-"П'ятниця\n"
-"Субота\n"
-"Нед╕ля\n"
-
-#: calendar/gui/event-editor-dialog.glade.h:78
-msgid "Every"
-msgstr "Кожен"
-
-#: calendar/gui/event-editor-dialog.glade.h:79
-msgid "month(s)"
-msgstr "м╕сяць"
-
-#: calendar/gui/event-editor-dialog.glade.h:82
+#: po/tmp/event-editor-dialog.glade.h:47
 msgid "year(s)"
 msgstr "р╕к"
 
-#: calendar/gui/event-editor-dialog.glade.h:83
-msgid "label27"
-msgstr "позначка27"
+#: calendar/gui/event-editor.c:329
+msgid "Edit Appointment"
+msgstr "Виправити зустр╕ч"
 
-#: calendar/gui/event-editor-dialog.glade.h:84
+#: calendar/gui/event-editor.c:407
 #, fuzzy
-msgid "Ending date"
-msgstr "К╕нцева дата"
-
-#: calendar/gui/event-editor-dialog.glade.h:85
-msgid "Repeat forever"
-msgstr ""
+msgid "on"
+msgstr "Пнд"
 
-#: calendar/gui/event-editor-dialog.glade.h:86
-msgid "End on "
-msgstr ""
+#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
+#: filter/filter-datespec.c:65
+msgid "day"
+msgstr "день"
 
-#: calendar/gui/event-editor-dialog.glade.h:87
+#: calendar/gui/event-editor.c:559
 #, fuzzy
-msgid "End after"
-msgstr "К╕нцева дата"
-
-#: calendar/gui/event-editor-dialog.glade.h:88
-msgid "occurrence(s)"
-msgstr ""
+msgid "on the"
+msgstr "м╕сяць"
 
-#: calendar/gui/event-editor-dialog.glade.h:89
+#: calendar/gui/event-editor.c:566
 #, fuzzy
-msgid "Exceptions"
-msgstr "Виключення"
+msgid "th"
+msgstr "4"
 
-#: calendar/gui/event-editor-dialog.glade.h:91
+#: calendar/gui/event-editor.c:722
 #, fuzzy
-msgid "Change"
-msgstr "Стор╕нка"
+msgid "occurrences"
+msgstr "Джерела"
 
-#: calendar/gui/event-editor-dialog.glade.h:93
-msgid "Recurrence"
+#: calendar/gui/event-editor.c:839
+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
+msgid "%a %b %d %Y"
 msgstr ""
 
 #: calendar/gui/getdate.y:391
@@ -1983,11 +2170,11 @@ msgstr "п'ятниця"
 msgid "saturday"
 msgstr "субота"
 
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:61
+#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
 msgid "year"
 msgstr "р╕к"
 
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:62
+#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
 msgid "month"
 msgstr "м╕сяць"
 
@@ -1995,19 +2182,15 @@ msgstr "м╕сяць"
 msgid "fortnight"
 msgstr ""
 
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:63
+#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
 msgid "week"
 msgstr "тиждень"
 
-#: calendar/gui/getdate.y:424 filter/filter-datespec.c:64
-msgid "day"
-msgstr "день"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:65
+#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
 msgid "hour"
 msgstr "година"
 
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:66
+#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
 msgid "minute"
 msgstr "хвилина"
 
@@ -2015,7 +2198,7 @@ msgstr "хвилина"
 msgid "min"
 msgstr "хв"
 
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:67
+#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
 msgid "second"
 msgstr "секунда"
 
@@ -2035,8 +2218,8 @@ msgstr "вчора"
 msgid "today"
 msgstr "сьогодн╕"
 
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:504
-#: filter/filter-datespec.c:664
+#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
+#: filter/filter-datespec.c:693
 msgid "now"
 msgstr "зараз"
 
@@ -2102,53 +2285,29 @@ msgstr "дванадцятий"
 msgid "ago"
 msgstr "тому"
 
-#: calendar/gui/gncal-todo.c:139
-msgid "Create to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:139
-msgid "Edit to-do item"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:175
-msgid "Summary:"
-msgstr ""
-
-#: calendar/gui/gncal-todo.c:186
-#, fuzzy
-msgid "Due Date:"
-msgstr "Дата"
-
-#: calendar/gui/gncal-todo.c:201
-msgid "Priority:"
-msgstr "Приор╕тет:"
-
-#: calendar/gui/gncal-todo.c:219
-msgid "Item Comments:"
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:710 calendar/gui/gnome-cal.c:1466
-#: calendar/gui/gnome-cal.c:1522
+#: 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:1144
+#: calendar/gui/gnome-cal.c:1152
 #, c-format
 msgid "Could not load the calendar in `%s'"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1155
+#: calendar/gui/gnome-cal.c:1163
 #, fuzzy, c-format
 msgid "Could not create a calendar in `%s'"
 msgstr "Створити новий календар"
 
-#: calendar/gui/gnome-cal.c:1166
+#: 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:1471 calendar/gui/gnome-cal.c:1526
+#: calendar/gui/gnome-cal.c:1479 calendar/gui/gnome-cal.c:1534
+#: mail/mail-search-dialogue.c:104
 msgid "Ok"
 msgstr "Гаразд"
 
@@ -2360,176 +2519,94 @@ msgstr "Поточний р╕к (%Y)"
 msgid "Print Calendar"
 msgstr "Надрукувати календар"
 
-#: calendar/gui/print.c:1309 mail/mail-callbacks.c:803
+#: calendar/gui/print.c:1309 mail/mail-callbacks.c:962
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
-#: calendar/gui/prop.c:336
-msgid "Time display"
-msgstr "В╕дображення часу"
-
-#. Time format
-#: calendar/gui/prop.c:340
-msgid "Time format"
-msgstr "Формат часу"
-
-#: calendar/gui/prop.c:341
-msgid "12-hour (AM/PM)"
-msgstr "12-годинний (ДП/ПП)"
-
-#: calendar/gui/prop.c:342
-msgid "24-hour"
-msgstr "24-годинний"
-
-#. Weeks start on
-#: calendar/gui/prop.c:352
-msgid "Weeks start on"
-msgstr "Початок тижня"
-
-#. Day range
-#: calendar/gui/prop.c:364
-msgid "Day range"
-msgstr "Д╕апазон дн╕в"
-
-#: calendar/gui/prop.c:375
-msgid ""
-"Please select the start and end hours you want\n"
-"to be displayed in the day view and week view.\n"
-"Times outside this range will not be displayed\n"
-"by default."
-msgstr ""
-
-#: calendar/gui/prop.c:391
-msgid "Day start:"
-msgstr ""
-
-#: calendar/gui/prop.c:402
-msgid "Day end:"
-msgstr ""
-
-#: calendar/gui/prop.c:525
-msgid "Colors for display"
-msgstr ""
-
-#: calendar/gui/prop.c:605
-msgid "Show on TODO List:"
-msgstr ""
-
-#: calendar/gui/prop.c:643
-msgid "To Do List style options:"
-msgstr ""
-
-#: calendar/gui/prop.c:648
-msgid "Highlight overdue items"
-msgstr ""
-
-#: calendar/gui/prop.c:651
-msgid "Highlight not yet due items"
-msgstr ""
-
-#: calendar/gui/prop.c:654
-msgid "Highlight items due today"
-msgstr ""
-
-#: calendar/gui/prop.c:684
-msgid "To Do List Properties"
-msgstr ""
-
-#: calendar/gui/prop.c:687
-msgid "To Do List"
-msgstr ""
-
-#: calendar/gui/prop.c:718
-msgid "Preferences"
-msgstr "Параметри"
-
-#: calendar/gui/prop.c:786
-msgid "Alarms"
-msgstr ""
+#. 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 "ПВСЧПСН"
 
-#. build miscellaneous box
-#: calendar/gui/prop.c:789
+#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
 #, fuzzy
-msgid "Alarm Properties"
-msgstr "Властивост╕ долучення"
+msgid "SMTWTFS"
+msgstr "ПВСЧПСН"
 
-#: calendar/gui/prop.c:799
-msgid "Beep on display alarms"
-msgstr ""
+#. well, this is really only a programatic error
+#: camel/camel-lock.c:90 camel/camel-lock.c:109 camel/camel-movemail.c:136
+#: camel/camel-movemail.c:183
+#, fuzzy, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Створити новий календар"
 
-#: calendar/gui/prop.c:809
-msgid "Audio alarms timeout after"
+#: camel/camel-lock.c:149 camel/camel-movemail.c:217
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: calendar/gui/prop.c:820 calendar/gui/prop.c:837
-msgid " seconds"
+#: camel/camel-lock.c:199
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: calendar/gui/prop.c:826
-msgid "Enable snoozing for "
+#: camel/camel-lock.c:253
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-movemail.c:96
+#: camel/camel-movemail.c:99
 #, fuzzy, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Створити новий календар"
 
-#: camel/camel-movemail.c:133 camel/camel-movemail.c:180
-#, fuzzy, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Створити новий календар"
-
-#: camel/camel-movemail.c:143
+#: camel/camel-movemail.c:146
 #, fuzzy, c-format
 msgid "Could not open mail file %s: %s"
 msgstr "Створити новий календар"
 
-#: camel/camel-movemail.c:153
+#: camel/camel-movemail.c:156
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:194
+#: camel/camel-movemail.c:197
 #, fuzzy, c-format
 msgid "Could not test lock file for %s: %s"
 msgstr "Створити новий календар"
 
-#: camel/camel-movemail.c:214
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-movemail.c:240
+#: camel/camel-movemail.c:243
 #, fuzzy, c-format
 msgid "Error reading mail file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: camel/camel-movemail.c:251
+#: camel/camel-movemail.c:254
 #, fuzzy, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: camel/camel-movemail.c:269
+#: camel/camel-movemail.c:272
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:301
+#: camel/camel-movemail.c:304
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Не вдалося створити канал: %s"
 
-#: camel/camel-movemail.c:313
+#: camel/camel-movemail.c:316
 #, fuzzy, c-format
 msgid "Could not fork: %s"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
-#: camel/camel-movemail.c:351
+#: camel/camel-movemail.c:354
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr ""
 
-#: camel/camel-movemail.c:352
+#: camel/camel-movemail.c:355
 msgid "(Unknown error)"
 msgstr "(Нев╕дома помилка)"
 
@@ -2543,56 +2620,60 @@ msgstr "Не вдалося завантажити %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "Не вдалося завантажити %s: нема╓ ╕н╕ц╕ал╕зац╕╖ в модул╕."
 
-#: camel/camel-remote-store.c:185
+#: camel/camel-remote-store.c:182
 #, fuzzy, c-format
 msgid "%s server %s"
 msgstr "Сервер:"
 
-#: camel/camel-remote-store.c:189
+#: camel/camel-remote-store.c:186
 #, c-format
 msgid "%s service for %s on %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:230
+#: camel/camel-remote-store.c:227
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr ""
 
-#: camel/camel-remote-store.c:231 camel/providers/imap/camel-imap-store.c:168
+#: camel/camel-remote-store.c:228
 msgid "(unknown host)"
 msgstr "(нев╕домий хост)"
 
-#: camel/camel-service.c:119
+#: camel/camel-remote-store.c:452
+msgid "Server disconnected."
+msgstr ""
+
+#: camel/camel-service.c:120
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr ""
 
-#: camel/camel-service.c:128
+#: camel/camel-service.c:129
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr ""
 
-#: camel/camel-service.c:137
+#: camel/camel-service.c:138
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr ""
 
-#: camel/camel-service.c:516
+#: camel/camel-service.c:488
 #, c-format
 msgid "No such host %s."
 msgstr ""
 
-#: camel/camel-service.c:519
+#: camel/camel-service.c:491
 #, c-format
 msgid "Temporarily unable to look up hostname %s."
 msgstr ""
 
-#: camel/camel-session.c:270
+#: camel/camel-session.c:272
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr ""
 
-#: camel/camel-session.c:358
+#: camel/camel-session.c:360
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2601,51 +2682,67 @@ msgstr ""
 "Не вдалося створити каталог %s:\n"
 "%s"
 
-#: camel/camel-url.c:77
+#: camel/camel-url.c:78
 #, c-format
 msgid "URL string `%s' contains no protocol"
 msgstr "Рядок URL \"%s\" не м╕стить назви протоколу"
 
-#: camel/camel-url.c:92
+#: camel/camel-url.c:93
 #, c-format
 msgid "URL string `%s' contains an invalid protocol"
 msgstr "Рядок URL \"%s\" не м╕стить нев╕рну назву протоколу"
 
-#: camel/camel-url.c:153
+#: camel/camel-url.c:154
 #, c-format
 msgid "Port number in URL `%s' is non-numeric"
 msgstr "Номер порта в URL \"%s\" не числовий"
 
-#: camel/providers/imap/camel-imap-command.c:220
+#: camel/providers/imap/camel-imap-auth.c:127
+#, fuzzy, c-format
+msgid ""
+"Could not get Kerberos ticket:\n"
+"%s"
+msgstr "Не вдалося створити канал: %s"
+
+#: camel/providers/imap/camel-imap-auth.c:198
+#, fuzzy
+msgid "Bad authentication response from server."
+msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
+
+#: camel/providers/imap/camel-imap-command.c:216
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Неоч╕кувана в╕дпов╕дь в╕д сервера IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:228
+#: camel/providers/imap/camel-imap-command.c:224
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:229 shell/e-storage.c:340
+#: camel/providers/imap/camel-imap-command.c:225 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Нев╕дома помилка"
 
-#: camel/providers/imap/camel-imap-command.c:370
+#: camel/providers/imap/camel-imap-command.c:271
+msgid "Server response ended too soon."
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:407
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:406
+#: camel/providers/imap/camel-imap-command.c:443
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:216
 #, c-format
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:578
+#: camel/providers/imap/camel-imap-folder.c:586
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -2657,27 +2754,31 @@ msgstr "IMAP4"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для зчитування та збереження плшти на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:139
-#: camel/providers/nntp/camel-nntp-store.c:292
-#: camel/providers/pop3/camel-pop3-store.c:150
+#: 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:141
+#: camel/providers/imap/camel-imap-store.c:236
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:166
-#, c-format
-msgid "Could not connect to IMAP server on %s."
+#: camel/providers/imap/camel-imap-store.c:245
+msgid "Kerberos 4"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-store.c:247
+msgid ""
+"This option will connect to the IMAP server using Kerberos 4 authentication."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:230
+#: camel/providers/imap/camel-imap-store.c:333
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:252
+#: camel/providers/imap/camel-imap-store.c:359
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -2685,54 +2786,196 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:457
+#: camel/providers/imap/camel-imap-store.c:539
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Не вдалося створити каталог %s: %s"
 
-#. FIXME: right error code
-#: camel/providers/mbox/camel-mbox-folder.c:220
-#, fuzzy
-msgid "Could not create summary"
-msgstr "Створити новий календар"
+#: camel/providers/local/camel-local-provider.c:36
+msgid "UNIX MH-format mail directories (CamelLocal version)"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:383
-#: camel/providers/mbox/camel-mbox-folder.c:386
-#, c-format
-msgid "Cannot append message to mbox file: %s"
+#: camel/providers/local/camel-local-provider.c:37
+msgid "For storing local mail in MH-like mail directories"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:47
+msgid "UNIX mbox-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:48
+msgid "For storing local mail in standard mbox format"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:58
+msgid "UNIX qmail maildir-format mail files (CamelLocal version)"
+msgstr ""
+
+#: camel/providers/local/camel-local-provider.c:59
+msgid "For storing local mail in qmail maildir directories"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-folder.c:489
+#: camel/providers/local/camel-local-store.c:122
 #, c-format
-msgid "Cannot get message: %s"
-msgstr "Не вдалося отримати пов╕домлення: %s"
+msgid "Store root %s is not an absolute path"
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:129
+#, fuzzy, c-format
+msgid "Store root %s is not a regular directory"
+msgstr "\"%s\" не ╓ звичайним файлом."
+
+#: camel/providers/local/camel-local-store.c:137
+#: camel/providers/local/camel-local-store.c:153
+#, fuzzy, c-format
+msgid "Cannot get folder: %s: %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:168
+msgid "Local stores do not have a root folder"
+msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:34
-msgid "UNIX mbox-format mail files"
+#: camel/providers/local/camel-local-store.c:176
+msgid "Local stores do not have a default folder"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-provider.c:36
+#: camel/providers/local/camel-local-store.c:186
+msgid "Local folders may not be nested."
+msgstr ""
+
+#: camel/providers/local/camel-local-store.c:200
+#, c-format
+msgid "Local mail file %s"
+msgstr "Файл локально╖ пошти %s"
+
+#: camel/providers/local/camel-local-store.c:256
+#, fuzzy, c-format
+msgid "Could not rename folder %s to %s: %s"
+msgstr "Не вдалося перейменувати теку \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:297
+#, fuzzy, c-format
+msgid "Could not delete folder summary file `%s': %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-local-store.c:306
+#, fuzzy, c-format
+msgid "Could not delete folder index file `%s': %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-maildir-folder.c:148
+#: camel/providers/local/camel-maildir-folder.c:156
+#: camel/providers/local/camel-maildir-folder.c:167
+#, fuzzy, c-format
+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-mh-folder.c:183
+#: camel/providers/local/camel-mh-folder.c:189
+#: camel/providers/local/camel-mh-folder.c:197
+#, fuzzy, c-format
 msgid ""
-"For reading mail delivered by the local system, and for storing mail on "
-"local disk."
+"Cannot get message: %s\n"
+"  %s"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: camel/providers/local/camel-maildir-folder.c:195
+#: camel/providers/local/camel-mbox-folder.c:311
+#: 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
+msgid "Invalid message contents"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:121
+#: camel/providers/local/camel-maildir-store.c:102
+#: camel/providers/local/camel-mh-store.c:96
 #, c-format
 msgid ""
-"Could not open file `%s':\n"
+"Could not open folder `%s':\n"
 "%s"
 msgstr ""
-"Не вдалося в╕дкрити файл \"%s\":\n"
+"Не вдалося в╕дкрити теку \"%s\":\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:128
-#: camel/providers/mh/camel-mh-store.c:122
+#: camel/providers/local/camel-maildir-store.c:106
+#: camel/providers/local/camel-mbox-store.c:108
+#: camel/providers/local/camel-mh-store.c:103
 #, c-format
 msgid "Folder `%s' does not exist."
 msgstr "Теки \"%s\" не ╕сну╓."
 
-#: camel/providers/mbox/camel-mbox-store.c:137
+#: camel/providers/local/camel-maildir-store.c:113
+#: camel/providers/local/camel-mh-store.c:109
+#, c-format
+msgid ""
+"Could not create folder `%s':\n"
+"%s"
+msgstr ""
+"Не вдалося створити теку \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-maildir-store.c:128
+#, fuzzy, c-format
+msgid "`%s' is not a maildir directory."
+msgstr "\"%s\" не ╓ каталогом."
+
+#: camel/providers/local/camel-maildir-store.c:157
+#: camel/providers/local/camel-maildir-store.c:194
+#: camel/providers/local/camel-mh-store.c:133
+#, c-format
+msgid "Could not delete folder `%s': %s"
+msgstr "Не вдалося стерти теку \"%s\": %s"
+
+#: camel/providers/local/camel-maildir-store.c:158
+#, fuzzy
+msgid "not a maildir directory"
+msgstr "Локальний поштовий каталог %s"
+
+#: camel/providers/local/camel-mbox-folder.c:195
+#, fuzzy, c-format
+msgid "Cannot open mailbox: %s: %s\n"
+msgstr "Створити новий календар"
+
+#: camel/providers/local/camel-mbox-folder.c:251
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: camel/providers/local/camel-mbox-folder.c:358
+msgid "The folder appears to be irrecoverably corrupted."
+msgstr ""
+
+#: camel/providers/local/camel-mbox-folder.c:369
+msgid "Message construction failed: Corrupt mailbox?"
+msgstr ""
+
+#: camel/providers/local/camel-mbox-store.c:101
+#, c-format
+msgid ""
+"Could not open file `%s':\n"
+"%s"
+msgstr ""
+"Не вдалося в╕дкрити файл \"%s\":\n"
+"%s"
+
+#: camel/providers/local/camel-mbox-store.c:117
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -2741,14 +2984,14 @@ msgstr ""
 "Не вдалось створити файл \"%s\":\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:146
-#: camel/providers/mbox/camel-mbox-store.c:180
+#: camel/providers/local/camel-mbox-store.c:126
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "\"%s\" не ╓ звичайним файлом."
 
-#: camel/providers/mbox/camel-mbox-store.c:172
-#: camel/providers/mbox/camel-mbox-store.c:208
+#: camel/providers/local/camel-mbox-store.c:145
+#: camel/providers/local/camel-mbox-store.c:168
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -2757,149 +3000,90 @@ msgstr ""
 "Не вдалось стерти теку \"%s\":\n"
 "%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:187
+#: camel/providers/local/camel-mbox-store.c:160
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "Тека \"%s\" не порожня. Не стерто."
 
-#: camel/providers/mbox/camel-mbox-store.c:225
-#, c-format
-msgid "Could not rename folder %s to %s: destination exists"
+#: camel/providers/local/camel-mbox-summary.c:234
+#, fuzzy, c-format
+msgid "Could not open folder: %s: summarising from position %ld: %s"
 msgstr ""
+"Не вдалося в╕дкрити теку \"%s\":\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-store.c:263
-msgid "Mbox folders may not be nested."
+#: camel/providers/local/camel-mbox-summary.c:268
+#, c-format
+msgid "Fatal mail parser error near position %ld in folder %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-store.c:277
-#, c-format
-msgid "Local mail file %s"
-msgstr "Файл локально╖ пошти %s"
+#: camel/providers/local/camel-mbox-summary.c:341
+#, fuzzy, c-format
+msgid "Cannot summarise folder: %s: %s"
+msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:650
-#, c-format
-msgid "Could not open summary %s"
+#: camel/providers/local/camel-mbox-summary.c:475
+#: camel/providers/local/camel-mbox-summary.c:661
+#, fuzzy, c-format
+msgid "Could not open folder to summarise: %s: %s"
 msgstr ""
+"Не вдалося в╕дкрити теку \"%s\":\n"
+"%s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:671
+#: camel/providers/local/camel-mbox-summary.c:491
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:715
-msgid "Summary mismatch, aborting sync"
+#: 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
+msgid "Summary and folder mismatch, even after a sync"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:735
-msgid "Summary mismatch, X-Evolution header missing"
-msgstr ""
-
-#: camel/providers/mbox/camel-mbox-summary.c:757
+#: camel/providers/local/camel-mbox-summary.c:562
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:770
-#: camel/providers/mbox/camel-mbox-summary.c:788
-#, c-format
-msgid "Cannot copy data to output file: %s"
-msgstr ""
+#: camel/providers/local/camel-mbox-summary.c:579
+#, fuzzy, c-format
+msgid "Writing to tmp mailbox failed: %s: %s"
+msgstr "Створити новий календар"
 
-#: camel/providers/mbox/camel-mbox-summary.c:813
+#: camel/providers/local/camel-mbox-summary.c:595
+#: camel/providers/local/camel-mbox-summary.c:748
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr ""
 
-#: camel/providers/mbox/camel-mbox-summary.c:822
+#: camel/providers/local/camel-mbox-summary.c:604
 #, c-format
 msgid "Could not close temp folder: %s"
 msgstr "Не вдалося закрити тимчасову теку: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:830
+#: camel/providers/local/camel-mbox-summary.c:615
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Не вдалося перейменувати теку: %s"
 
-#: camel/providers/mbox/camel-mbox-summary.c:842
+#: camel/providers/local/camel-mbox-summary.c:817
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Нев╕дома помилка: %s"
 
-#. FIXME: right error code
-#: camel/providers/mh/camel-mh-folder.c:211
-msgid "Could not load or create summary"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-folder.c:330
-#: camel/providers/mh/camel-mh-folder.c:333
+#: camel/providers/local/camel-mh-folder.c:147
+#: camel/providers/local/camel-mh-folder.c:155
 #, fuzzy, c-format
-msgid "Cannot append message to mh folder: %s"
+msgid "Cannot append message to mh folder: %s: %s"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: camel/providers/mh/camel-mh-folder.c:399
-#, fuzzy, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
-
-#: camel/providers/mh/camel-mh-provider.c:34
-msgid "UNIX MH-format mail directories"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-provider.c:36
-msgid "For storing local mail in MH-like mail directories"
-msgstr ""
-
-#: camel/providers/mh/camel-mh-store.c:115
-#, c-format
-msgid ""
-"Could not open folder `%s':\n"
-"%s"
-msgstr ""
-"Не вдалося в╕дкрити теку \"%s\":\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:130
-#, c-format
-msgid ""
-"Could not create folder `%s':\n"
-"%s"
-msgstr ""
-"Не вдалося створити теку \"%s\":\n"
-"%s"
-
-#: camel/providers/mh/camel-mh-store.c:139
+#: camel/providers/local/camel-mh-store.c:116
 #, c-format
 msgid "`%s' is not a directory."
 msgstr "\"%s\" не ╓ каталогом."
 
-#: camel/providers/mh/camel-mh-store.c:158
-#: camel/providers/mh/camel-mh-store.c:171
-#, c-format
-msgid "Could not delete folder `%s': %s"
-msgstr "Не вдалося стерти теку \"%s\": %s"
-
-#: camel/providers/mh/camel-mh-store.c:189
-#: camel/providers/mh/camel-mh-store.c:193
-#, c-format
-msgid "Could not rename folder `%s': %s"
-msgstr "Не вдалося перейменувати теку \"%s\": %s"
-
-#: camel/providers/mh/camel-mh-store.c:197
-#, c-format
-msgid "Could not rename folder `%s': %s exists"
-msgstr "Не вдалося перейменувати теку \"%s\": %s ╕сну╓"
-
-#: camel/providers/mh/camel-mh-store.c:205
-msgid "MH folders may not be nested."
-msgstr ""
-
-#: camel/providers/mh/camel-mh-store.c:217
-#, c-format
-msgid "Local mail directory %s"
-msgstr "Локальний поштовий каталог %s"
-
 #: camel/providers/nntp/camel-nntp-auth.c:41
 #, c-format
 msgid "Please enter the NNTP password for %s@%s"
@@ -2917,7 +3101,7 @@ msgstr "Не вдалося в╕д╕слати ╕м'я користувача на сервер"
 msgid "Server rejected username/password"
 msgstr "Сервер в╕дкинув ╕м'я користувача ╕ пароль"
 
-#: camel/providers/nntp/camel-nntp-folder.c:140
+#: camel/providers/nntp/camel-nntp-folder.c:144
 #, c-format
 msgid "Message %s not found."
 msgstr "Пов╕домлення %s не знайдено."
@@ -2926,13 +3110,13 @@ msgstr "Пов╕домлення %s не знайдено."
 msgid "Could not get group list from server."
 msgstr "Не вдалося отримати сп╕сок груп з сервера."
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:93
-#: camel/providers/nntp/camel-nntp-grouplist.c:102
+#: camel/providers/nntp/camel-nntp-grouplist.c:94
+#: camel/providers/nntp/camel-nntp-grouplist.c:103
 #, c-format
 msgid "Unable to load grouplist file for %s: %s"
 msgstr "Не вдалося завантажити список груп для %s: %s"
 
-#: camel/providers/nntp/camel-nntp-grouplist.c:151
+#: camel/providers/nntp/camel-nntp-grouplist.c:153
 #, c-format
 msgid "Unable to save grouplist file for %s: %s"
 msgstr "Не вдалося зберегти список груп для %s: %s"
@@ -2950,33 +3134,33 @@ msgstr ""
 msgid "Could not open directory for news server: %s"
 msgstr "Не вдалося в╕дкрити каталог сервера новин: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:287
+#: camel/providers/nntp/camel-nntp-store.c:288
 #, c-format
 msgid "USENET News via %s"
 msgstr "Новини USENET через %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:294
+#: camel/providers/nntp/camel-nntp-store.c:295
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:333
-#: camel/providers/nntp/camel-nntp-store.c:499
+#: camel/providers/nntp/camel-nntp-store.c:334
+#: camel/providers/nntp/camel-nntp-store.c:500
 #, c-format
 msgid "Unable to open or create .newsrc file for %s: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:177
+#: camel/providers/pop3/camel-pop3-folder.c:179
 msgid "Could not open folder: message listing was incomplete."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:271
+#: camel/providers/pop3/camel-pop3-folder.c:273
 #, fuzzy, c-format
 msgid "No message with uid %s"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: camel/providers/pop3/camel-pop3-folder.c:285
+#: camel/providers/pop3/camel-pop3-folder.c:287
 #, c-format
 msgid "Could not retrieve message from POP server %s: %s"
 msgstr ""
@@ -2991,66 +3175,66 @@ msgid ""
 "mail from certain web mail providers and proprietary email systems."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:152
+#: camel/providers/pop3/camel-pop3-store.c:150
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:162
+#: camel/providers/pop3/camel-pop3-store.c:160
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
 "claim to support it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:174
+#: camel/providers/pop3/camel-pop3-store.c:172
 msgid ""
 "This will connect to the POP server and use Kerberos 4 to authenticate to it."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:219
+#: camel/providers/pop3/camel-pop3-store.c:217
 #, c-format
 msgid "Could not authenticate to KPOP server: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:337
+#: camel/providers/pop3/camel-pop3-store.c:335
 #, fuzzy, c-format
 msgid "Could not connect to POP server on %s."
 msgstr "Створити новий календар"
 
-#: camel/providers/pop3/camel-pop3-store.c:391
+#: camel/providers/pop3/camel-pop3-store.c:389
 #, c-format
 msgid "%sPlease enter the POP3 password for %s@%s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:410
+#: camel/providers/pop3/camel-pop3-store.c:408
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending username: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:413
-#: camel/providers/pop3/camel-pop3-store.c:450
+#: camel/providers/pop3/camel-pop3-store.c:411
+#: camel/providers/pop3/camel-pop3-store.c:448
 #, fuzzy
 msgid "(Unknown)"
 msgstr "Нев╕дома помилка"
 
-#: camel/providers/pop3/camel-pop3-store.c:440
+#: camel/providers/pop3/camel-pop3-store.c:438
 msgid ""
 "Unable to connect to POP server.\n"
 "No support for requested authentication mechanism."
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:448
+#: camel/providers/pop3/camel-pop3-store.c:446
 #, c-format
 msgid ""
 "Unable to connect to POP server.\n"
 "Error sending password: %s"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-store.c:554
+#: camel/providers/pop3/camel-pop3-store.c:555
 #, c-format
 msgid "No such folder `%s'."
 msgstr ""
@@ -3115,108 +3299,108 @@ msgstr ""
 msgid "For reading mail as a query of another set of folders"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:85
+#: composer/e-msg-composer-attachment-bar.c:87
 msgid "1 byte"
 msgstr "1 байт"
 
-#: composer/e-msg-composer-attachment-bar.c:87
+#: composer/e-msg-composer-attachment-bar.c:89
 #, c-format
 msgid "%u bytes"
 msgstr "%u байт╕в"
 
-#: composer/e-msg-composer-attachment-bar.c:94
+#: composer/e-msg-composer-attachment-bar.c:96
 #, c-format
 msgid "%.1fK"
 msgstr "%.1fК"
 
-#: composer/e-msg-composer-attachment-bar.c:98
+#: composer/e-msg-composer-attachment-bar.c:100
 #, c-format
 msgid "%.1fM"
 msgstr "%.1fМ"
 
-#: composer/e-msg-composer-attachment-bar.c:102
+#: composer/e-msg-composer-attachment-bar.c:104
 #, c-format
 msgid "%.1fG"
 msgstr "%.1fГ"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:299 mail/mail-display.c:119
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
 msgid "attachment"
 msgstr "долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:395
+#: composer/e-msg-composer-attachment-bar.c:417
+#: po/tmp/evolution-message-composer.xml.h:7
 msgid "Attach a file"
 msgstr "Долучити файл"
 
-#: composer/e-msg-composer-attachment-bar.c:442 filter/filter.glade.h:22
-#: filter/filter.glade.h:25 shell/e-shortcuts-view.c:239
-#: shell/e-shortcuts-view.c:356
+#: composer/e-msg-composer-attachment-bar.c:464 po/tmp/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:443
+#: composer/e-msg-composer-attachment-bar.c:465
 msgid "Remove selected items from the attachment list"
 msgstr "Видалити вибран╕ елементи з списку долучення"
 
-#: composer/e-msg-composer-attachment-bar.c:474
+#: composer/e-msg-composer-attachment-bar.c:496
 msgid "Add attachment..."
 msgstr "Долучити..."
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:497
 msgid "Attach a file to the message"
 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.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: composer/e-msg-composer-attachment.glade.h:7
+#: po/tmp/e-msg-composer-attachment.glade.h:6
 msgid "Attachment properties"
 msgstr "Властивост╕ долучення"
 
-#: composer/e-msg-composer-attachment.glade.h:8
-msgid "MIME type:"
-msgstr "Тип MIME:"
-
-#: composer/e-msg-composer-attachment.glade.h:10
+#: po/tmp/e-msg-composer-attachment.glade.h:8
 msgid "File name:"
 msgstr "Назва файлу:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:295
+#: po/tmp/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
 msgid "From:"
 msgstr "В╕д:"
 
-#: composer/e-msg-composer-hdrs.c:243
+#: composer/e-msg-composer-hdrs.c:238
 msgid "Click here for the address book"
 msgstr "Клацн╕ть тут щоб викликати адресну книгу"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:291
 #, fuzzy
 msgid "Enter the identity you wish to send this message from"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:300
+#: composer/e-msg-composer-hdrs.c:295 mail/mail-format.c:625
 msgid "To:"
 msgstr "До:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:296
 msgid "Enter the recipients of the message"
 msgstr "Введ╕ть адресат╕в пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:305
+#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:301
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення"
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:306
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:312
+#: composer/e-msg-composer-hdrs.c:307
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3224,15 +3408,15 @@ msgstr ""
 "Введ╕ть адресат╕в, що отримають коп╕ю пов╕домлення не попавши в список "
 "отримувач╕в."
 
-#: composer/e-msg-composer-hdrs.c:318
+#: composer/e-msg-composer-hdrs.c:313 mail/mail-format.c:629
 msgid "Subject:"
 msgstr "Тема:"
 
-#: composer/e-msg-composer-hdrs.c:319
+#: composer/e-msg-composer-hdrs.c:314
 msgid "Enter the subject of the mail"
 msgstr "Введ╕ть тему послання"
 
-#: composer/e-msg-composer.c:298
+#: composer/e-msg-composer.c:429
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3241,131 +3425,149 @@ msgstr ""
 "Не вдалося в╕дкрити файл п╕дпису %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:407
+#: composer/e-msg-composer.c:599
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: composer/e-msg-composer.c:418
+#: composer/e-msg-composer.c:610
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Помилка збереження файлу: %s"
 
-#: composer/e-msg-composer.c:438
+#: composer/e-msg-composer.c:630
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: composer/e-msg-composer.c:460
+#: composer/e-msg-composer.c:652
 msgid "Saving changes to message..."
 msgstr "Зберегти зм╕ни в пов╕домленн╕..."
 
-#: composer/e-msg-composer.c:462
+#: composer/e-msg-composer.c:654
 msgid "Save changes to message..."
 msgstr "Зберегти зм╕ни в пов╕домленн╕..."
 
-#: composer/e-msg-composer.c:503
+#: composer/e-msg-composer.c:695
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr ""
 
-#: composer/e-msg-composer.c:547 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:553
+#: composer/e-msg-composer.c:745
 msgid ""
 "This message has not been sent.\n"
 "\n"
 "Do you wish to save your changes?"
 msgstr ""
 
-#: composer/e-msg-composer.c:575
+#: composer/e-msg-composer.c:767
 msgid "Open file"
 msgstr "В╕дкрити файл"
 
-#: composer/e-msg-composer.c:701
+#: composer/e-msg-composer.c:893
 msgid "That file does not exist."
 msgstr "Цього файлу не ╕сну╓."
 
-#: composer/e-msg-composer.c:711
+#: composer/e-msg-composer.c:903
 msgid "That is not a regular file."
 msgstr "Це не звичайний файл."
 
-#: composer/e-msg-composer.c:721
+#: composer/e-msg-composer.c:913
 msgid "That file exists but is not readable."
 msgstr ""
 
-#: composer/e-msg-composer.c:731
+#: composer/e-msg-composer.c:923
 msgid "That file appeared accesible but open(2) failed."
 msgstr ""
 
-#: composer/e-msg-composer.c:753
+#: composer/e-msg-composer.c:945
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
 msgstr ""
 
-#: composer/e-msg-composer.c:774
+#: composer/e-msg-composer.c:966
 msgid "An error occurred while reading the file."
 msgstr "Сталася помилка п╕д час зчитування файлу."
 
-#: composer/e-msg-composer.c:1136
+#: composer/e-msg-composer.c:1343
 #, fuzzy
 msgid "Compose a message"
 msgstr "П╕дготувати нове поштове пов╕домлення"
 
-#: composer/e-msg-composer.c:1210
+#: composer/e-msg-composer.c:1420
 #, fuzzy
 msgid "Could not create composer window."
 msgstr "Створити новий календар"
 
-#: filter/filter-datespec.c:61
+#: composer/evolution-composer.c:307
+#, fuzzy
+msgid "Cannot initialize Evolution's composer."
+msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#: filter/e-search-bar.c:176
+#, fuzzy
+msgid "Sear_ch"
+msgstr "Пошук"
+
+#: filter/filter-datespec.c:62
 #, fuzzy
 msgid "years"
 msgstr "Заголовок"
 
-#: filter/filter-datespec.c:62
+#: filter/filter-datespec.c:63
 #, fuzzy
 msgid "months"
 msgstr "Шрифти"
 
-#: filter/filter-datespec.c:63
+#: filter/filter-datespec.c:64
 #, fuzzy
 msgid "weeks"
 msgstr "Тиждень"
 
-#: filter/filter-datespec.c:64
+#: filter/filter-datespec.c:65
 #, fuzzy
 msgid "days"
 msgstr "Т╕ло"
 
-#: filter/filter-datespec.c:65
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr ""
 
-#: filter/filter-datespec.c:66
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr ""
 
-#: filter/filter-datespec.c:67
+#: filter/filter-datespec.c:68
 #, fuzzy
 msgid "seconds"
 msgstr "В╕д╕слати"
 
-#: filter/filter-datespec.c:232
+#: filter/filter-datespec.c:183
+msgid "Oops. You have forgotten to choose a date."
+msgstr ""
+
+#: filter/filter-datespec.c:185
+msgid "Oops. You have chosen an invalid date."
+msgstr ""
+
+#: filter/filter-datespec.c:259
 msgid ""
 "The message's date will be compared against\n"
 "whatever the time is when the filter is run\n"
 "or vfolder is opened."
 msgstr ""
 
-#: filter/filter-datespec.c:254
+#: filter/filter-datespec.c:282
 msgid ""
 "The message's date will be compared against\n"
 "the time that you specify here."
 msgstr ""
 
-#: filter/filter-datespec.c:293
+#: filter/filter-datespec.c:322
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when the filter is run;\n"
@@ -3373,44 +3575,48 @@ msgid ""
 msgstr ""
 
 #. keep in sync with FilterDatespec_type!
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "the current time"
 msgstr ""
 
-#: filter/filter-datespec.c:328
+#: filter/filter-datespec.c:357
 msgid "a time you specify"
 msgstr ""
 
-#: filter/filter-datespec.c:329
+#: filter/filter-datespec.c:358
 msgid "a time relative to the current time"
 msgstr ""
 
 #. The label
-#: filter/filter-datespec.c:387
+#: filter/filter-datespec.c:416
 msgid "Compare against"
 msgstr ""
 
-#: filter/filter-datespec.c:661
+#: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<клацн╕ть тут для вибору дати>"
 
-#: filter/filter-editor.c:159 mail/mail-autofilter.c:287
-#: mail/mail-autofilter.c:336
+#: filter/filter-editor.c:160 mail/mail-autofilter.c:286
+#: mail/mail-autofilter.c:335
 #, fuzzy
 msgid "Add Filter Rule"
 msgstr "Редагування"
 
-#: filter/filter-editor.c:207
+#: filter/filter-editor.c:233
 #, fuzzy
 msgid "Edit Filter Rule"
 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.
-#.
-#: filter/filter-editor.c:404 filter/filter.glade.h:7
+#: filter/filter-editor.c:433
+msgid "incoming"
+msgstr ""
+
+#. "demand",
+#: filter/filter-editor.c:435
+msgid "outgoing"
+msgstr ""
+
+#: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 #, fuzzy
 msgid "Edit Filters"
 msgstr "Редагування"
@@ -3431,84 +3637,103 @@ msgstr "Д╕╖"
 msgid "Remove action"
 msgstr "Видалити"
 
-#: filter/filter-folder.c:186 filter/vfolder-rule.c:271
+#: filter/filter-folder.c:143
+msgid ""
+"Oops, you forgot to choose a folder.\n"
+"Please go back and specify a valid folder to deliver mail to."
+msgstr ""
+
+#: filter/filter-folder.c:218 filter/vfolder-rule.c:271
 #, fuzzy
 msgid "Select Folder"
 msgstr "Вибрати назви"
 
-#: filter/filter-folder.c:209
+#: filter/filter-folder.c:243
 msgid "Enter folder URI"
 msgstr ""
 
-#: filter/filter-folder.c:254
+#: filter/filter-folder.c:289
 msgid "<click here to select a folder>"
 msgstr "<клацн╕ть тут для вибору теки>"
 
-#: filter/filter-part.c:420
+#: filter/filter-input.c:184
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+
+#: filter/filter-message-search.c:379 filter/filter-message-search.c:447
+#, c-format
+msgid "Failed to perform regex search on message header: %s"
+msgstr ""
+
+#: filter/filter-part.c:456
 msgid "Test"
 msgstr "Тест"
 
-#: filter/filter-rule.c:509
+#: filter/filter-rule.c:520
 msgid "Rule name: "
 msgstr "Назва правила: "
 
-#: filter/filter-rule.c:513
+#: filter/filter-rule.c:524
 msgid "Untitled"
 msgstr ""
 
-#: filter/filter-rule.c:527
+#: filter/filter-rule.c:540
 msgid "If"
 msgstr ""
 
-#: filter/filter-rule.c:544
+#: filter/filter-rule.c:557
 msgid "Execute actions"
 msgstr ""
 
-#: filter/filter-rule.c:548
+#: filter/filter-rule.c:561
 msgid "if all criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:553
+#: filter/filter-rule.c:566
 msgid "if any criteria are met"
 msgstr ""
 
-#: filter/filter-rule.c:564
+#: filter/filter-rule.c:577
 #, fuzzy
 msgid "Add criterion"
 msgstr "Д╕╖"
 
-#: filter/filter-rule.c:570
+#: filter/filter-rule.c:583
 #, fuzzy
 msgid "Remove criterion"
 msgstr "Видалити"
 
-#: filter/filter.glade.h:8
-msgid ""
-"Incoming\n"
-"Outgoing\n"
-msgstr ""
-
-#: filter/filter.glade.h:11
-#, fuzzy
-msgid "Filter Rules"
-msgstr "Редагування"
-
-#: filter/filter.glade.h:13 filter/filter.glade.h:18
-#: mail/mail-config.glade.h:12 mail/mail-config.glade.h:17
-#: mail/mail-config.glade.h:23
+#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Виправити"
 
-#: filter/filter.glade.h:15
+#: po/tmp/filter.glade.h:10
 #, fuzzy
 msgid "Edit VFolders"
 msgstr "Теки"
 
-#: filter/filter.glade.h:16
+#: po/tmp/filter.glade.h:11
+#, fuzzy
+msgid "Filter Rules"
+msgstr "Редагування"
+
+#: po/tmp/filter.glade.h:12
+msgid "Incoming"
+msgstr ""
+
+#: po/tmp/filter.glade.h:13
+msgid "Outgoing"
+msgstr ""
+
+#: po/tmp/filter.glade.h:15
 msgid "Virtual Folders"
 msgstr "В╕ртуальн╕ теки"
 
-#: filter/filter.glade.h:20 filter/filter.glade.h:23
+#: po/tmp/filter.glade.h:16
 #, fuzzy
 msgid "vFolder Sources"
 msgstr "Теки"
@@ -3547,90 +3772,145 @@ msgid "Message Body"
 msgstr "Т╕ло пов╕домлення"
 
 #: filter/libfilter-i18n.h:11
+#, fuzzy
+msgid "Message Header"
+msgstr "Т╕ло пов╕домлення"
+
+#: filter/libfilter-i18n.h:12
 msgid "Message was received"
 msgstr "Пов╕домлення було отримано"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
 msgid "Message was sent"
 msgstr "Пов╕домлення було в╕д╕слано"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:14
 msgid "Move to Folder"
 msgstr "Перенести в теку"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:16
 msgid "Recipients"
 msgstr "Адресати"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:17
+msgid "Regex Match"
+msgstr ""
+
+#: filter/libfilter-i18n.h:18
 msgid "Sender"
 msgstr "В╕дправник"
 
-#: filter/libfilter-i18n.h:17
+#: filter/libfilter-i18n.h:19
+#, fuzzy
+msgid "Set Status"
+msgstr "Стан:"
+
+#: filter/libfilter-i18n.h:20
 msgid "Source"
 msgstr "Джерело"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:21
 msgid "Specific header"
 msgstr ""
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:22
+#, fuzzy
+msgid "Status"
+msgstr "Стан:"
+
+#: filter/libfilter-i18n.h:23
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:24
 msgid "Subject"
 msgstr "Тема"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:25
 #, fuzzy
 msgid "after"
 msgstr "К╕нцева дата"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:26
 msgid "before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:27
 #, fuzzy
 msgid "contains"
 msgstr "Д╕╖"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:28
 msgid "does not contain"
 msgstr ""
 
-#: filter/libfilter-i18n.h:25
+#: filter/libfilter-i18n.h:29
+msgid "does not end with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:30
+#, fuzzy
+msgid "does not exist"
+msgstr "Цього файлу не ╕сну╓."
+
+#: filter/libfilter-i18n.h:31
+#, fuzzy
+msgid "does not sound like"
+msgstr "Файлу не знайдено"
+
+#: filter/libfilter-i18n.h:32
+#, fuzzy
+msgid "does not start with"
+msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
+
+#: filter/libfilter-i18n.h:33
+msgid "ends with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:34
+#, fuzzy
+msgid "exists"
+msgstr "Тест"
+
+#: filter/libfilter-i18n.h:35
 msgid "is greater than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:36
 msgid "is less than"
 msgstr ""
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:37
 msgid "is not"
 msgstr ""
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:38
 msgid "is"
 msgstr ""
 
-#: filter/libfilter-i18n.h:29
+#: filter/libfilter-i18n.h:39
 #, fuzzy
 msgid "on or after"
 msgstr "К╕нцева дата"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:40
 msgid "on or before"
 msgstr ""
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:41
+msgid "sounds like"
+msgstr ""
+
+#: filter/libfilter-i18n.h:42
+msgid "starts with"
+msgstr ""
+
+#: filter/libfilter-i18n.h:43
 #, fuzzy
 msgid "was after"
 msgstr "К╕нцева дата"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:44
 msgid "was before"
 msgstr ""
 
@@ -3656,84 +3936,168 @@ msgstr "Редагування"
 msgid "Edit VFolder Rule"
 msgstr ""
 
-#: mail/component-factory.c:236
+#: mail/component-factory.c:227
 #, fuzzy
 msgid "Cannot initialize Evolution's mail component."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: mail/component-factory.c:243
-#, fuzzy
-msgid "Cannot initialize Evolution's mail summary component."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
-
-#: mail/component-factory.c:248
-#, fuzzy
-msgid "Cannot initialize Evolution's mail storage hash."
-msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
-
-#: mail/component-factory.c:330
-#, c-format
-msgid "Bad storage URL (no server): %s"
-msgstr ""
-
-#: mail/component-factory.c:349
+#: mail/component-factory.c:266
 msgid "Cannot register storage with shell"
 msgstr ""
 
-#: mail/folder-browser.c:137
+#: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:16
+msgid "Save"
+msgstr "Зберегти"
+
+#: mail/folder-browser.c:153
 msgid "Body or subject contains"
 msgstr ""
 
-#: mail/folder-browser.c:138
+#: mail/folder-browser.c:154
 msgid "Body contains"
 msgstr "Т╕ло м╕стить"
 
-#: mail/folder-browser.c:139
+#: mail/folder-browser.c:155
 msgid "Subject contains"
 msgstr "Тема м╕стить"
 
-#: mail/folder-browser.c:140
+#: mail/folder-browser.c:156
 msgid "Body does not contain"
 msgstr "Т╕ло не м╕стить"
 
-#: mail/folder-browser.c:141
+#: mail/folder-browser.c:157
 msgid "Subject does not contain"
 msgstr "Тема не м╕стить"
 
-#: mail/folder-browser.c:142
-msgid "Custom search"
+#: mail/folder-browser.c:453
+msgid "VFolder on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:454
+msgid "VFolder on Sender"
 msgstr ""
 
-#: mail/folder-browser.c:314
+#: mail/folder-browser.c:455
 #, fuzzy
-msgid "Custom"
-msgstr "Вир╕зати"
+msgid "VFolder on Recipients"
+msgstr "Адресати пов╕домлення"
 
-#: mail/folder-browser.c:492
+#: mail/folder-browser.c:457
+msgid "Filter on Subject"
+msgstr ""
+
+#: mail/folder-browser.c:458
 #, fuzzy
-msgid "Full Search"
-msgstr "Пошук"
+msgid "Filter on Sender"
+msgstr "Файлу не знайдено"
 
-#: mail/folder-browser.c:497
-msgid "Save"
-msgstr "Зберегти"
+#: mail/folder-browser.c:459
+#, fuzzy
+msgid "Filter on Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: mail/folder-browser.c:460 mail/folder-browser.c:544
+msgid "Filter on Mailing List"
+msgstr ""
+
+#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#, fuzzy
+msgid "Open"
+msgstr "В╕дкрити"
+
+#: mail/folder-browser.c:466
+#, fuzzy
+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
+msgid "Print"
+msgstr "Друкувати"
+
+#: mail/folder-browser.c:469
+msgid "Reply to Sender"
+msgstr "В╕дпов╕сти в╕дправнику"
+
+#: mail/folder-browser.c:470 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:34
+msgid "Reply to All"
+msgstr "В╕дпов╕сти вс╕м"
+
+#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: po/tmp/evolution-mail.xml.h:17
+msgid "Forward"
+msgstr "Переслати"
+
+#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#, fuzzy
+msgid "Forward inline"
+msgstr "Переслати"
+
+#: mail/folder-browser.c:474
+#, fuzzy
+msgid "Mark as Read"
+msgstr "Позначити як прочитане"
+
+#: mail/folder-browser.c:475
+#, fuzzy
+msgid "Mark as Unread"
+msgstr "Позначити як непрочитане"
+
+#: mail/folder-browser.c:477
+#, fuzzy
+msgid "Move to Folder..."
+msgstr "Перенести в теку"
+
+#: mail/folder-browser.c:478
+#, fuzzy
+msgid "Copy to Folder..."
+msgstr "Скоп╕ювати у теку"
+
+#: mail/folder-browser.c:480
+#, fuzzy
+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
+#, fuzzy
+msgid "Apply Filters"
+msgstr "Редагування"
+
+#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule From Message"
+msgstr ""
+
+#: mail/folder-browser.c:546
+#, c-format
+msgid "Filter on Mailing List (%s)"
+msgstr ""
 
-#: mail/mail-autofilter.c:76
+#: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
+#: mail/mail-autofilter.c:214
+#, fuzzy, c-format
+msgid "Subject is %s"
+msgstr "Тема"
+
 #: mail/mail-autofilter.c:230
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:332
+#: mail/mail-autofilter.c:331
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-callbacks.c:73
+#: mail/mail-callbacks.c:74
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -3741,130 +4105,190 @@ msgid ""
 "Would you like to configure it now?"
 msgstr ""
 
-#: mail/mail-callbacks.c:113
+#: mail/mail-callbacks.c:114
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:127
+#: mail/mail-callbacks.c:128
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
 msgstr ""
 
-#: mail/mail-callbacks.c:163 mail/mail-callbacks.c:175
+#: mail/mail-callbacks.c:164 mail/mail-callbacks.c:176
 msgid "You have no mail sources configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:213
 msgid "You have not set a mail transport method"
 msgstr ""
 
-#: mail/mail-callbacks.c:221
+#: mail/mail-callbacks.c:222
 msgid "You have no Outbox configured"
 msgstr ""
 
-#: mail/mail-callbacks.c:245
+#: mail/mail-callbacks.c:246
 msgid ""
 "This message has no subject.\n"
 "Really send?"
 msgstr ""
 
-#: mail/mail-callbacks.c:515
+#: mail/mail-callbacks.c:291
+msgid "You must specify recipients in order to send this message."
+msgstr ""
+
+#: mail/mail-callbacks.c:552
 #, fuzzy
 msgid "Move message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:517
+#: mail/mail-callbacks.c:554
 #, fuzzy
 msgid "Copy message(s) to"
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-callbacks.c:619
+#: mail/mail-callbacks.c:665
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
 msgstr ""
 
-#: mail/mail-callbacks.c:718
+#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+msgid "Overwrite file?"
+msgstr "Переписати файл?"
+
+#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+msgid ""
+"A file by that name already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Файл з ц╕╓ю назвою вже ╕сну╓.\n"
+"Переписати його?"
+
+#: mail/mail-callbacks.c:748
+#, fuzzy
+msgid "Save Message As..."
+msgstr "Зберегти як..."
+
+#: mail/mail-callbacks.c:750
+#, fuzzy
+msgid "Save Messages As..."
+msgstr "Зберегти як..."
+
+#: mail/mail-callbacks.c:877
 #, fuzzy, c-format
 msgid ""
 "Error loading filter information:\n"
 "%s"
 msgstr "Помилка завантаження файлу: %s"
 
-#: mail/mail-callbacks.c:763 mail/message-list.c:1564
+#: mail/mail-callbacks.c:922
 #, fuzzy
 msgid "Print Message"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/mail-callbacks.c:810
+#: mail/mail-callbacks.c:969
 #, fuzzy
 msgid "Printing of message failed"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/mail-config-gui.c:432
+#.
+#. * 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
+msgid "Identity"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:7
+msgid "Mail Configuration"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:8
+msgid "Mail Source"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:9 po/tmp/mail-config.glade.h:12
+msgid "Mail Transport"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:10
+msgid "Welcome to the Evolution Mail configuration wizard!\n"
+msgstr ""
+
+#: po/tmp/mail-config-druid.glade.h:14
+msgid ""
+"Your email configuration is now complete.\n"
+"Click \"Finish\" to save your new settings"
+msgstr ""
+
+#: mail/mail-config-gui.c:433
 msgid ""
 "Enter your name and email address to be used in outgoing mail. You may also, "
 "optionally, enter the name of your organization, and the name of a file to "
 "read your signature from."
 msgstr ""
 
-#: mail/mail-config-gui.c:445
+#: mail/mail-config-gui.c:446
 msgid "Full name:"
 msgstr "Повна назва:"
 
-#: mail/mail-config-gui.c:469
+#: mail/mail-config-gui.c:470
 msgid "Email address:"
 msgstr "Електронна адреса:"
 
-#: mail/mail-config-gui.c:484
+#: mail/mail-config-gui.c:485
 msgid "Organization:"
 msgstr "Ор╕╓нтац╕я:"
 
-#: mail/mail-config-gui.c:495
+#: mail/mail-config-gui.c:496
 msgid "Signature file:"
 msgstr "Файл п╕дпису:"
 
-#: mail/mail-config-gui.c:500 mail/mail-config.glade.h:10
+#: mail/mail-config-gui.c:501 po/tmp/mail-config.glade.h:19
 msgid "Signature File"
 msgstr "Файл п╕дпису"
 
-#: mail/mail-config-gui.c:906
+#: mail/mail-config-gui.c:922
 msgid "Server:"
 msgstr "Сервер:"
 
-#: mail/mail-config-gui.c:912
+#: mail/mail-config-gui.c:928
 msgid "Username:"
 msgstr "Назва користувача:"
 
-#: mail/mail-config-gui.c:918
+#: mail/mail-config-gui.c:934
 msgid "Path:"
 msgstr "Шлях:"
 
-#: mail/mail-config-gui.c:927
+#: mail/mail-config-gui.c:943
 msgid "Authentication:"
 msgstr "Аутенф╕кац╕я:"
 
-#: mail/mail-config-gui.c:941
+#: 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 ""
 
-#: mail/mail-config-gui.c:980
+#: mail/mail-config-gui.c:1003
 msgid "Test Settings"
 msgstr ""
 
-#: mail/mail-config-gui.c:1107
+#: mail/mail-config-gui.c:1130
 #, fuzzy
 msgid "Mail source type:"
 msgstr "Джерело паперу:"
 
-#: mail/mail-config-gui.c:1112 mail/mail-config-gui.c:1160
+#: mail/mail-config-gui.c:1135 mail/mail-config-gui.c:1183
 msgid ""
 "Select the kind of mail server you have, and enter the relevant information "
 "about it.\n"
@@ -3873,12 +4297,12 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1131
+#: mail/mail-config-gui.c:1154
 #, fuzzy
 msgid "News source type:"
 msgstr "Новий тип телефона"
 
-#: mail/mail-config-gui.c:1136
+#: mail/mail-config-gui.c:1159
 msgid ""
 "Select the kind of news server you have, and enter the relevant information "
 "about it.\n"
@@ -3887,181 +4311,113 @@ msgid ""
 "types...\" button after entering the other information."
 msgstr ""
 
-#: mail/mail-config-gui.c:1155
+#: mail/mail-config-gui.c:1178
 msgid "Mail transport type:"
 msgstr ""
 
-#: mail/mail-config-gui.c:1210
+#: mail/mail-config-gui.c:1233
 msgid "Add Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1212
+#: mail/mail-config-gui.c:1235
 msgid "Edit Identity"
 msgstr ""
 
-#: mail/mail-config-gui.c:1310
+#: mail/mail-config-gui.c:1333
 msgid "Add Source"
 msgstr "Додати джерело"
 
-#: mail/mail-config-gui.c:1312
+#: mail/mail-config-gui.c:1335
 msgid "Edit Source"
 msgstr "Виправити джерело"
 
-#: mail/mail-config-gui.c:1407
+#: mail/mail-config-gui.c:1430
 msgid "Add News Server"
 msgstr "Додати сервер новин"
 
-#: mail/mail-config-gui.c:1409
+#: mail/mail-config-gui.c:1432
 msgid "Edit News Server"
 msgstr "Виправити сервер новин"
 
-#: mail/mail-config-gui.c:2233
+#: mail/mail-config-gui.c:2253
 #, c-format
 msgid "Testing \"%s\""
 msgstr "Перев╕рка \"%s\""
 
-#: mail/mail-config-gui.c:2235
+#: mail/mail-config-gui.c:2255
 #, c-format
 msgid "Test connection to \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2277
+#: mail/mail-config-gui.c:2296
 msgid "The connection was successful!"
 msgstr ""
 
-#: mail/mail-config-gui.c:2327
+#: mail/mail-config-gui.c:2346
 #, c-format
 msgid "Querying authorization capabilities of \"%s\""
 msgstr ""
 
-#: mail/mail-config-gui.c:2329
+#: mail/mail-config-gui.c:2348
 #, c-format
 msgid "Query authorization at \"%s\""
 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.
-#.
-#: mail/mail-config-druid.glade.h:7 mail/mail-config-druid.glade.h:8
-#: mail/mail-config-druid.glade.h:16
-msgid "Mail Configuration"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:9
-msgid ""
-"Welcome to the Evolution Mail configuration wizard!\n"
-"By filling in some information about your email\n"
-"settings, you can start sending and receiving email\n"
-"right away. Click Next to continue."
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:13
-msgid "Identity"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:14
-msgid "Mail Source"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:15 mail/mail-config.glade.h:20
-msgid "Mail Transport"
-msgstr ""
-
-#: mail/mail-config-druid.glade.h:17
-msgid ""
-"Your email configuration is now complete.\n"
-"Click \"Finish\" to save your new settings"
-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.
-#.
-#: mail/mail-config.glade.h:7 mail/mail-config.glade.h:14
-msgid "Identities"
-msgstr ""
-
-#: mail/mail-config.glade.h:8
+#: po/tmp/mail-config.glade.h:7
 msgid "Address"
 msgstr "Адреса"
 
-#: mail/mail-config.glade.h:9
-msgid "Organization"
-msgstr "Орган╕зац╕я"
-
-#: mail/mail-config.glade.h:15
-msgid "Sources"
-msgstr "Джерела"
+#: po/tmp/mail-config.glade.h:10
+msgid "Identities"
+msgstr ""
 
-#: mail/mail-config.glade.h:19
+#: po/tmp/mail-config.glade.h:11
 msgid "Mail Sources"
 msgstr "Поштов╕ джерела"
 
-#: mail/mail-config.glade.h:21
+#: po/tmp/mail-config.glade.h:13
+#, fuzzy
+msgid "Mark message as seen [ms]: "
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: po/tmp/mail-config.glade.h:14
 msgid "News Servers"
 msgstr "Сервери новин"
 
-#: mail/mail-config.glade.h:25
+#: po/tmp/mail-config.glade.h:15
 msgid "News Sources"
 msgstr "Джерела новин"
 
-#: mail/mail-config.glade.h:26
+#: po/tmp/mail-config.glade.h:16
+msgid "Organization"
+msgstr "Орган╕зац╕я"
+
+#: po/tmp/mail-config.glade.h:18
 msgid "Send messages in HTML format"
 msgstr "В╕д╕слати пов╕домлення у формат╕ HTML"
 
-#: mail/mail-config.glade.h:27
-#, fuzzy
-msgid "Mark message as seen [ms]: "
-msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
-
-#: mail/mail-crypto.c:137
-#, c-format
-msgid "Couldn't create pipe to %s: %s"
-msgstr "Не вдалось створити канал до %s: %s"
-
-#: mail/mail-crypto.c:164
-#, c-format
-msgid "Could not execute %s: %s\n"
-msgstr "Не вдалось виконати %s: %s\n"
-
-#: mail/mail-crypto.c:168
-#, c-format
-msgid "Cannot fork %s: %s"
-msgstr ""
+#: po/tmp/mail-config.glade.h:20
+msgid "Sources"
+msgstr "Джерела"
 
-#: mail/mail-crypto.c:345 mail/mail-crypto.c:441 mail/mail-crypto.c:604
+#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
 msgid "Please enter your PGP/GPG passphrase."
 msgstr ""
 
-#: mail/mail-crypto.c:349 mail/mail-crypto.c:445 mail/mail-crypto.c:609
+#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
 msgid "No password provided."
 msgstr ""
 
-#: mail/mail-crypto.c:355 mail/mail-crypto.c:451 mail/mail-crypto.c:615
+#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "Неможливо створити канал до GPG/PGP: %s"
 
-#: mail/mail-crypto.c:600
+#: mail/mail-crypto.c:625
 msgid "No GPG/PGP program available."
 msgstr "Програма GPG/PGP не доспуна."
 
-#: mail/mail-display.c:68
-msgid "Overwrite file?"
-msgstr "Переписати файл?"
-
-#: mail/mail-display.c:72
-msgid ""
-"A file by that name already exists.\n"
-"Overwrite it?"
-msgstr ""
-"Файл з ц╕╓ю назвою вже ╕сну╓.\n"
-"Переписати його?"
-
-#: mail/mail-display.c:87
+#: mail/mail-display.c:90
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4070,446 +4426,526 @@ msgstr ""
 "Неможливо в╕дкрити файл %s:\n"
 "%s"
 
-#: mail/mail-display.c:99
+#: mail/mail-display.c:113
 #, fuzzy, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось ╕н╕ц╕ал╕зувати Bonobo"
 
-#: mail/mail-display.c:195
+#: mail/mail-display.c:218
 msgid "Save Attachment"
 msgstr "Зберегти долучення"
 
-#: mail/mail-display.c:235
+#: mail/mail-display.c:258
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: mail/mail-display.c:277
+#: mail/mail-display.c:300
 msgid "Save to Disk..."
 msgstr "Зберегти на диск..."
 
-#: mail/mail-display.c:279
+#: mail/mail-display.c:302
 #, c-format
 msgid "Open in %s..."
 msgstr "В╕дкрити в %s..."
 
-#: mail/mail-display.c:281
+#: mail/mail-display.c:304
 msgid "View Inline"
 msgstr ""
 
-#: mail/mail-display.c:305
+#: mail/mail-display.c:328
 msgid "External Viewer"
 msgstr ""
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:351
 #, c-format
 msgid "View Inline (via %s)"
 msgstr ""
 
-#: mail/mail-display.c:332
+#: mail/mail-display.c:355
 #, fuzzy
 msgid "Hide"
 msgstr "Заголовок"
 
-#: mail/mail-local.c:279
+#: mail/mail-format.c:500
+#, fuzzy, c-format
+msgid "%s attachment"
+msgstr "долучення"
+
+#: mail/mail-format.c:623
+#, fuzzy
+msgid "Reply-To:"
+msgstr "В╕дпов╕сти"
+
+#: mail/mail-format.c:845
+msgid "No GPG/PGP support available in this copy of Evolution."
+msgstr ""
+
+#: mail/mail-format.c:857
+msgid "Encrypted message not displayed"
+msgstr ""
+
+#: mail/mail-format.c:863
+#, fuzzy
+msgid "Encrypted message"
+msgstr "Виправити пов╕домлення"
+
+#: mail/mail-format.c:864
+msgid "Click icon to decrypt."
+msgstr ""
+
+#: mail/mail-format.c:1470
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1482
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr ""
+
+#: mail/mail-format.c:1486
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr ""
+
+#: mail/mail-format.c:1520
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+
+#: mail/mail-format.c:1525
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/mail-format.c:1695
+#, c-format
+msgid "On %s, %s wrote:\n"
+msgstr ""
+
+#: mail/mail-local.c:202
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:283
+#: mail/mail-local.c:206
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr ""
 
-#: mail/mail-local.c:327
+#: mail/mail-local.c:261
 msgid "Closing current folder"
 msgstr "Закривання поточно╖ теки"
 
-#: mail/mail-local.c:359
+#: mail/mail-local.c:293
 msgid "Renaming old folder and opening"
 msgstr "Перейменування старо╖ теки та в╕дкривання"
 
-#: mail/mail-local.c:380
+#: mail/mail-local.c:314
 msgid "Creating new folder"
 msgstr "Створення ново╖ теки"
 
-#: mail/mail-local.c:395
+#: mail/mail-local.c:329
 msgid "Copying messages"
 msgstr "Коп╕ювання пов╕домлень"
 
-#: mail/mail-local.c:407
+#: mail/mail-local.c:341
 #, 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:443
+#: mail/mail-local.c:372
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
 msgstr ""
 
-#. This is how we could do to display extra information about the
-#. folder.
-#: mail/mail-local-storage.c:97
-msgid " (XXX unread)"
-msgstr ""
+#: mail/mail-local.c:781
+#, fuzzy
+msgid "Registering local folder"
+msgstr "Створення ново╖ теки"
+
+#: mail/mail-local.c:783
+#, fuzzy
+msgid "Register local folder"
+msgstr "Створити нову теку"
 
-#: mail/mail-ops.c:68
+#: mail/mail-ops.c:79
 #, c-format
 msgid "Fetching email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:70
+#: mail/mail-ops.c:81
 #, c-format
 msgid "Fetch email from %s"
 msgstr ""
 
-#: mail/mail-ops.c:110
-#, fuzzy, c-format
-msgid "Retrieving messages : %s"
-msgstr "Переслати це пов╕домлення"
-
-#: mail/mail-ops.c:253
+#: mail/mail-ops.c:331
 #, c-format
 msgid "There is no new mail at %s."
 msgstr ""
 
-#: mail/mail-ops.c:310
+#: mail/mail-ops.c:401
 msgid "Filtering email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:312
+#: mail/mail-ops.c:403
 msgid "Filter email on demand"
 msgstr ""
 
-#: mail/mail-ops.c:441
+#: mail/mail-ops.c:538
 #, c-format
 msgid "Sending \"%s\""
 msgstr "В╕дсилання \"%s\""
 
-#: mail/mail-ops.c:446
+#: mail/mail-ops.c:543
 msgid "Sending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:449
+#: mail/mail-ops.c:546
 #, c-format
 msgid "Send \"%s\""
 msgstr "В╕д╕слати \"%s\""
 
-#: mail/mail-ops.c:452
+#: mail/mail-ops.c:549
 #, fuzzy
 msgid "Send a message without a subject"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:626
+#: mail/mail-ops.c:720
 msgid "Sending queue"
 msgstr ""
 
-#: mail/mail-ops.c:628
+#: mail/mail-ops.c:722
 msgid "Send queue"
 msgstr ""
 
-#: mail/mail-ops.c:764 mail/mail-ops.c:771
+#: mail/mail-ops.c:858 mail/mail-ops.c:865
 #, c-format
 msgid "Appending \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:768 mail/mail-ops.c:774
+#: mail/mail-ops.c:862 mail/mail-ops.c:868
 msgid "Appending a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:846
+#: mail/mail-ops.c:940
 #, c-format
 msgid "Expunging \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:848
+#: mail/mail-ops.c:942
 #, c-format
 msgid "Expunge \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:907
+#: mail/mail-ops.c:1001
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:909
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:912
+#: mail/mail-ops.c:1006
 #, fuzzy, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "В╕д╕слан╕ пов╕домлення"
 
-#: mail/mail-ops.c:914
+#: mail/mail-ops.c:1008
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:945
+#: mail/mail-ops.c:1039
 msgid "Moving"
 msgstr "Перенесення"
 
-#: mail/mail-ops.c:948
+#: mail/mail-ops.c:1042
 msgid "Copying"
 msgstr "Коп╕ювання"
 
-#: mail/mail-ops.c:968
+#: mail/mail-ops.c:1062
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1047
+#: mail/mail-ops.c:1141
 #, fuzzy, c-format
 msgid "Marking messages in folder \"%s\""
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:1050
+#: mail/mail-ops.c:1144
 #, fuzzy, c-format
 msgid "Mark messages in folder \"%s\""
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:1081
+#: mail/mail-ops.c:1175
 #, fuzzy, c-format
 msgid "Marking message %d of %d"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-ops.c:1201
+#: mail/mail-ops.c:1295
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1204
+#: mail/mail-ops.c:1297
 #, c-format
 msgid "Scan folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1275 mail/subscribe-dialog.c:163
+#: mail/mail-ops.c:1366 mail/subscribe-dialog.c:339
 msgid "(No description)"
 msgstr "(Нема╓ опису)"
 
-#: mail/mail-ops.c:1335
+#: mail/mail-ops.c:1432
 #, c-format
 msgid "Attaching messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1338
+#: mail/mail-ops.c:1435
 #, c-format
 msgid "Attach messages from \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1441
+#: mail/mail-ops.c:1535
 #, fuzzy, c-format
 msgid "Forwarding messages \"%s\""
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-ops.c:1446
+#: mail/mail-ops.c:1539
 msgid "Forwarding a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1449
+#: mail/mail-ops.c:1542
 #, c-format
 msgid "Forward message \"%s\""
 msgstr "Переслати  пов╕домлення \"%s\""
 
-#: mail/mail-ops.c:1454
+#: mail/mail-ops.c:1546
 msgid "Forward a message without a subject"
 msgstr ""
 
-#: mail/mail-ops.c:1491
+#: mail/mail-ops.c:1593
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-ops.c:1508
+#: mail/mail-ops.c:1610
 msgid ""
 "Failed to generate mime part from message while generating forwarded message."
 msgstr ""
 
-#: mail/mail-ops.c:1594
+#: mail/mail-ops.c:1665
+#, 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 "Завантаження \"%s\""
 
-#: mail/mail-ops.c:1596
+#: mail/mail-ops.c:1750
 #, c-format
 msgid "Load \"%s\""
 msgstr "Завантажити \"%s\""
 
-#: mail/mail-ops.c:1698
+#: mail/mail-ops.c:1853
 #, c-format
 msgid "Creating \"%s\""
 msgstr "Створення \"%s\""
 
-#: mail/mail-ops.c:1700
+#: mail/mail-ops.c:1855
 #, c-format
 msgid "Create \"%s\""
 msgstr "Створити \"%s\""
 
-#: mail/mail-ops.c:1748
+#: mail/mail-ops.c:1903
 msgid "Exception while reporting result to shell component listener."
 msgstr ""
 
-#: mail/mail-ops.c:1794
+#: mail/mail-ops.c:1949
 #, c-format
 msgid "Synchronizing \"%s\""
 msgstr "Синхрон╕зац╕я \"%s\""
 
-#: mail/mail-ops.c:1796
+#: mail/mail-ops.c:1951
 #, c-format
 msgid "Synchronize \"%s\""
 msgstr "Синхрон╕зувати \"%s\""
 
-#: mail/mail-ops.c:1859
+#: mail/mail-ops.c:2015
 #, c-format
 msgid "Displaying message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1862
+#: mail/mail-ops.c:2018
 msgid "Clearing message display"
 msgstr ""
 
-#: mail/mail-ops.c:1865
+#: mail/mail-ops.c:2021
 #, c-format
 msgid "Display message UID \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1868
+#: mail/mail-ops.c:2024
 msgid "Clear message display"
 msgstr ""
 
-#: mail/mail-ops.c:1977
+#: mail/mail-ops.c:2137
 #, c-format
 msgid "Opening messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1980
+#: mail/mail-ops.c:2140
 #, c-format
 msgid "Open messages from \"%s\""
 msgstr "В╕дкрити пов╕домлення з \"%s\""
 
-#: mail/mail-ops.c:2084
+#: mail/mail-ops.c:2244
 #, c-format
 msgid "Loading %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2086
+#: mail/mail-ops.c:2246
 #, c-format
 msgid "Load %s Folder"
 msgstr ""
 
-#: mail/mail-ops.c:2153
+#: mail/mail-ops.c:2310
 #, c-format
 msgid "Viewing messages from folder \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:2156
+#: mail/mail-ops.c:2313
 #, fuzzy, c-format
 msgid "View messages from \"%s\""
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/mail-ops.c:2182
+#: mail/mail-ops.c:2339
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr ""
 
-#: mail/mail-threads.c:299
+#: mail/mail-ops.c:2428
+#, fuzzy, c-format
+msgid "Saving messages from folder \"%s\""
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: mail/mail-ops.c:2431
+#, fuzzy, c-format
+msgid "Save messages from folder \"%s\""
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: mail/mail-ops.c:2474
+#, fuzzy, c-format
+msgid "Saving message %d of %d (uid \"%s\")"
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
+
+#: mail/mail-search-dialogue.c:104
+#, fuzzy
+msgid "Cancel"
+msgstr "В╕дм╕нено"
+
+#: mail/mail-summary.c:105 mail/mail-threads.c:728
+msgid "Incomplete message written on pipe!"
+msgstr ""
+
+#: mail/mail-threads.c:301
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:648
+#: mail/mail-threads.c:675
 #, c-format
 msgid ""
 "Error while `%s':\n"
 "%s"
 msgstr ""
 
-#: mail/mail-threads.c:701
-msgid "Incomplete message written on pipe!"
-msgstr ""
-
-#: mail/mail-threads.c:705
+#: mail/mail-threads.c:732
 msgid "Error reading commands from dispatching thread."
 msgstr ""
 
-#: mail/mail-threads.c:770
+#: mail/mail-threads.c:797
 msgid "Corrupted message from dispatching thread?"
 msgstr ""
 
-#: mail/mail-threads.c:889
+#: mail/mail-threads.c:916
 msgid "Could not create dialog box."
 msgstr ""
 
-#: mail/mail-threads.c:899
+#: mail/mail-threads.c:927
 msgid "User cancelled query."
 msgstr ""
 
-#: mail/mail-tools.c:210
+#: mail/mail-tools.c:189
 #, c-format
 msgid "Couldn't create temporary mbox `%s': %s"
 msgstr ""
 
 #. Get all uids of source
-#: mail/mail-tools.c:264
+#: mail/mail-tools.c:239
 #, c-format
 msgid "Examining %s"
 msgstr "Перев╕рка %s"
 
-#: mail/mail-tools.c:294
+#: mail/mail-tools.c:269
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 
 #. Info
-#: mail/mail-tools.c:315
+#: mail/mail-tools.c:290
 #, fuzzy, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Переслати це пов╕домлення"
 
 #. Append it to dest
-#: mail/mail-tools.c:328
+#: mail/mail-tools.c:303
 #, fuzzy, c-format
 msgid "Writing message %d of %d"
 msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: mail/mail-tools.c:357
+#: mail/mail-tools.c:332
 #, fuzzy, c-format
 msgid "Saving changes to %s"
 msgstr "В╕д╕слати пов╕домлення"
 
-#: mail/mail-tools.c:391
+#: mail/mail-tools.c:369
 #, fuzzy, c-format
 msgid "[%s] (forwarded message)"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-tools.c:400
+#: mail/mail-tools.c:379
 msgid "Fwd: (no subject)"
 msgstr ""
 
-#: mail/mail-tools.c:437
+#: mail/mail-tools.c:418
 #, fuzzy, c-format
 msgid "Forwarded message - %s"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-tools.c:439
+#: mail/mail-tools.c:420
 #, fuzzy
 msgid "Forwarded message (no subject)"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-tools.c:551
-#, c-format
-msgid "Don't know protocol to open URI `%s'"
-msgstr ""
-
-#: mail/mail-tools.c:580
+#: mail/mail-tools.c:523
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -4520,169 +4956,138 @@ msgstr ""
 msgid "VFolders"
 msgstr "В╕ртуальн╕ теки"
 
-#: mail/mail-vfolder.c:292
+#: mail/mail-vfolder.c:296
 msgid "New VFolder"
 msgstr "Нова в╕ртуальна тека"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:151 ui/evolution-mail.h:47
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
 msgid "Reply"
 msgstr "В╕дпов╕сти"
 
-#: mail/mail-view.c:151 ui/evolution-mail.h:48
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
 msgid "Reply to the sender of this message"
 msgstr ""
 
-#: mail/mail-view.c:154 mail/message-list.c:1567 ui/evolution-mail.h:49
-msgid "Reply to All"
-msgstr "В╕дпов╕сти вс╕м"
-
-#: mail/mail-view.c:154 ui/evolution-mail.h:50
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
 msgid "Reply to all recipients of this message"
 msgstr ""
 
-#: mail/mail-view.c:157 ui/evolution-mail.h:51
-msgid "Forward"
-msgstr "Переслати"
-
-#: mail/mail-view.c:157 ui/evolution-mail.h:52
+#: mail/mail-view.c:159 po/tmp/evolution-mail.xml.h:19
 msgid "Forward this message"
 msgstr "Переслати це пов╕домлення"
 
-#: mail/mail-view.c:161 ui/evolution-addressbook.h:18
-#: ui/evolution-calendar.h:24 ui/evolution-mail.h:57
-msgid "Print"
-msgstr "Друкувати"
-
-#: mail/mail-view.c:161 ui/evolution-mail.h:58
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
 msgid "Print the selected message"
 msgstr "Надрукувати вибране пов╕домлення"
 
-#: mail/mail-view.c:163 ui/evolution-mail.h:60
+#: mail/mail-view.c:165 po/tmp/evolution-mail.xml.h:12
 msgid "Delete this message"
 msgstr "Стерти це пов╕домлення"
 
-#: mail/message-list.c:511
+#: mail/message-list.c:572
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:514
+#: mail/message-list.c:575
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:517
+#: mail/message-list.c:578
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:1562
-msgid "Open in New Window"
-msgstr "В╕дкрити у новому в╕кн╕"
-
-#: mail/message-list.c:1563
-msgid "Edit Message"
-msgstr "Виправити пов╕домлення"
-
-#: mail/message-list.c:1566
-msgid "Reply to Sender"
-msgstr "В╕дпов╕сти в╕дправнику"
-
-#: mail/message-list.c:1568
-msgid "Forward Message"
-msgstr "Переслати пов╕домлення"
-
-#: mail/message-list.c:1570
-msgid "Delete Message"
-msgstr "Стерти пов╕домлення"
-
-#: mail/message-list.c:1571
-msgid "Move Message"
-msgstr "Перенести пов╕домлення"
-
-#: mail/message-list.c:1572
-msgid "Copy Message"
-msgstr "Скоп╕ювати пов╕домлення"
-
-#: mail/message-list.c:1574
-msgid "VFolder on Subject"
+#: mail/message-list.c:846
+#, c-format
+msgid "[ %s ]"
 msgstr ""
 
-#: mail/message-list.c:1575
-msgid "VFolder on Sender"
+#. 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
+#, c-format
+msgid "%s, et al."
 msgstr ""
 
-#: mail/message-list.c:1576
+#: mail/message-list.c:860 mail/message-list.c:875
 #, fuzzy
-msgid "VFolder on Recipients"
-msgstr "Адресати пов╕домлення"
-
-#: mail/message-list.c:1578
-msgid "Filter on Subject"
-msgstr ""
+msgid "<unknown>"
+msgstr "Нев╕дома помилка"
 
-#: mail/message-list.c:1579
+#: mail/message-list.c:2068
 #, fuzzy
-msgid "Filter on Sender"
-msgstr "Файлу не знайдено"
+msgid "Rebuilding message view"
+msgstr "Переслати це пов╕домлення"
 
-#: mail/message-list.c:1580
-#, fuzzy
-msgid "Filter on Recipients"
-msgstr "Адресати пов╕домлення"
+#: mail/message-list.c:2070
+msgid "Rebuild message view"
+msgstr ""
 
-#: mail/message-list.c:1581 mail/message-list.c:1604
-msgid "Filter on Mailing List"
+#: mail/subscribe-dialog.c:139
+msgid "Display folders starting with:"
 msgstr ""
 
-#: mail/message-list.c:1606
+#: mail/subscribe-dialog.c:172
 #, c-format
-msgid "Filter on Mailing List (%s)"
+msgid "Getting store for \"%s\""
 msgstr ""
 
-#: mail/message-list.c:1694
-#, fuzzy
-msgid "Rebuilding message view"
-msgstr "Переслати це пов╕домлення"
+#: mail/subscribe-dialog.c:175
+#, c-format
+msgid "Get store for \"%s\""
+msgstr ""
 
-#: mail/message-list.c:1696
-msgid "Rebuild message view"
+#: mail/subscribe-dialog.c:282
+#, fuzzy, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "Сканування тек в \"%s\""
+
+#: mail/subscribe-dialog.c:286
+#, c-format
+msgid "Unsubscribing from folder \"%s\""
 msgstr ""
 
-#: mail/subscribe-dialog.c:118
-msgid "Display folders containing:"
+#: mail/subscribe-dialog.c:290
+#, fuzzy, c-format
+msgid "Subscribe to folder \"%s\""
+msgstr "Сканування тек в \"%s\""
+
+#: mail/subscribe-dialog.c:293
+#, c-format
+msgid "Unsubscribe from folder \"%s\""
 msgstr ""
 
-#: shell/e-setup.c:106 shell/e-setup.c:175
+#: shell/e-setup.c:112 shell/e-setup.c:183
 msgid "Evolution installation"
 msgstr "╤нсталяц╕я Evolution"
 
-#: shell/e-setup.c:110
+#: shell/e-setup.c:116
 msgid ""
 "This new version of Evolution needs to install additional files\n"
 "into your personal Evolution directory"
 msgstr ""
 
-#: shell/e-setup.c:111
+#: shell/e-setup.c:117
 msgid "Please click \"OK\" to install the files, or \"Cancel\" to exit."
 msgstr ""
 
-#: shell/e-setup.c:152
+#: shell/e-setup.c:155
 msgid "Could not update files correctly"
 msgstr ""
 
-#: shell/e-setup.c:156 shell/e-setup.c:216
+#: shell/e-setup.c:158 shell/e-setup.c:224
 msgid "Evolution files successfully installed."
 msgstr "Файли Evolution усп╕шно встановлено."
 
-#: shell/e-setup.c:179
+#: shell/e-setup.c:187
 msgid "This seems to be the first time you run Evolution."
 msgstr ""
 
-#: shell/e-setup.c:180
+#: shell/e-setup.c:188
 msgid "Please click \"OK\" to install the Evolution user files under"
 msgstr ""
 
-#: shell/e-setup.c:197
+#: shell/e-setup.c:205
 #, c-format
 msgid ""
 "Cannot create the directory\n"
@@ -4693,14 +5098,14 @@ msgstr ""
 "%s\n"
 "Помилка: %s"
 
-#: shell/e-setup.c:212
+#: shell/e-setup.c:220
 #, c-format
 msgid ""
 "Cannot copy files into\n"
 "`%s'."
 msgstr ""
 
-#: shell/e-setup.c:237
+#: shell/e-setup.c:245
 #, c-format
 msgid ""
 "The file `%s' is not a directory.\n"
@@ -4708,7 +5113,7 @@ msgid ""
 "of the Evolution user files."
 msgstr ""
 
-#: shell/e-setup.c:249
+#: shell/e-setup.c:257
 #, c-format
 msgid ""
 "The directory `%s' exists but is not the\n"
@@ -4760,44 +5165,44 @@ msgstr "Bug buddy не знайдено за шляхом вказаним в $PATH."
 msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
-#: shell/e-shell-view-menu.c:169
+#: shell/e-shell-view-menu.c:172
 msgid "Copyright 1999, 2000 Helix Code, Inc."
 msgstr "Copyright 1999, 2000 Helix Code, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
 "within the GNOME desktop environment."
 msgstr ""
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:335
 msgid "Go to folder..."
 msgstr "Перейти на теку..."
 
-#: shell/e-shell-view.c:136
+#: shell/e-shell-view.c:140
 msgid "(No folder displayed)"
 msgstr ""
 
-#: shell/e-shell-view.c:417
+#: shell/e-shell-view.c:455
 msgid "Folders"
 msgstr "Теки"
 
-#: shell/e-shell-view.c:993
+#: shell/e-shell-view.c:1077
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
 
-#: shell/e-shell-view.c:1133
+#: shell/e-shell.c:372
 #, c-format
-msgid ""
-"Ooops!  The view for `%s' has died unexpectedly.  :-(\n"
-"This probably means that the %s component has crashed."
+msgid "Cannot set up local storage -- %s"
 msgstr ""
 
-#: shell/e-shell.c:336
+#: shell/e-shell.c:1208
 #, c-format
-msgid "Cannot set up local storage -- %s"
+msgid ""
+"Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
+"This probably means that the %s component has crashed."
 msgstr ""
 
 #: shell/e-shortcuts-view.c:122
@@ -4868,65 +5273,67 @@ msgstr ""
 msgid "Error saving shortcuts."
 msgstr ""
 
-#: shell/e-storage.c:127
+#: 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
+#, fuzzy
+msgid "_View"
+msgstr "Новий"
+
+#: shell/e-storage-set-view.c:235
+#, fuzzy
+msgid "View the selected folder"
+msgstr "Надрукувати вибране пов╕домлення"
+
+#: shell/e-storage.c:138
 msgid "(No name)"
 msgstr ""
 
-#: shell/e-storage.c:318
+#: shell/e-storage.c:389
 msgid "No error"
 msgstr "Без помилок"
 
-#: shell/e-storage.c:320
+#: shell/e-storage.c:391
 msgid "Generic error"
 msgstr ""
 
-#: shell/e-storage.c:322
+#: shell/e-storage.c:393
 msgid "A folder with the same name already exists"
 msgstr "Тека з ц╕╓ю назвою вже ╕сну╓"
 
-#: shell/e-storage.c:324
+#: shell/e-storage.c:395
 msgid "The specified folder type is not valid"
 msgstr "Вказаний тип теки не в╕рний"
 
-#: shell/e-storage.c:326
+#: shell/e-storage.c:397
 msgid "I/O error"
 msgstr "Помилка вводу/виводу"
 
-#: shell/e-storage.c:328
+#: shell/e-storage.c:399
 msgid "Not enough space to create the folder"
 msgstr "Не вистача╓ м╕сця для створення теки"
 
-#: shell/e-storage.c:330
+#: shell/e-storage.c:401
 msgid "The specified folder was not found"
 msgstr "Вказано╖ теки не знайдено"
 
-#: shell/e-storage.c:332
+#: shell/e-storage.c:403
 msgid "Function not implemented in this storage"
 msgstr ""
 
-#: shell/e-storage.c:334
+#: shell/e-storage.c:405
 msgid "Permission denied"
 msgstr ""
 
-#: shell/e-storage.c:336
+#: shell/e-storage.c:407
 msgid "Operation not supported"
 msgstr "Операц╕я не п╕дтриму╓ться"
 
-#: shell/e-storage.c:338
+#: shell/e-storage.c:409
 msgid "The specified type is not supported in this storage"
 msgstr ""
 
-#: shell/e-storage-set-view.c:223 ui/evolution.h:15 ui/evolution.h:29
-#, fuzzy
-msgid "_View"
-msgstr "Новий"
-
-#: shell/e-storage-set-view.c:223
-#, fuzzy
-msgid "View the selected folder"
-msgstr "Надрукувати вибране пов╕домлення"
-
-#: shell/main.c:68
+#: shell/main.c:74
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -4948,612 +5355,1224 @@ msgid ""
 "await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:95
+#: shell/main.c:101
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:123
+#: shell/main.c:132
 msgid "Cannot initialize the Evolution shell."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
 
-#: shell/main.c:160
+#: shell/main.c:178
+msgid "Disable."
+msgstr ""
+
+#: shell/main.c:198
 msgid "Cannot initialize the Bonobo component system."
 msgstr "Не вдалося ╕н╕ц╕ал╕зувати компонентну систему Bonobo."
 
 #.
-#. *  This file is autogenerated from evolution-addressbook-ldap.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-addressbook-ldap.h:9
-msgid "_Actions"
-msgstr "Д╕╖"
-
-#: ui/evolution-addressbook-ldap.h:10
+#: po/tmp/evolution-addressbook-ldap.xml.h:6
 #, fuzzy
 msgid "N_ew Directory Server"
 msgstr "Сервер:"
 
-#.
-#. *  This file is autogenerated from evolution-addressbook.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-addressbook.h:9
-#, fuzzy
-msgid "_Print Contacts..."
-msgstr "Зв'язки..."
+#: po/tmp/evolution-addressbook-ldap.xml.h:7
+msgid "_Actions"
+msgstr "Д╕╖"
 
-#: ui/evolution-addressbook.h:11
+#: po/tmp/evolution-addressbook.xml.h:7
+msgid "Create a new contact"
+msgstr ""
+
+#: po/tmp/evolution-addressbook.xml.h:9
 #, fuzzy
-msgid "_New Contact"
+msgid "Delete a contact"
 msgstr "Стерти контактну ╕нформац╕ю?"
 
-#: ui/evolution-addressbook.h:12
-msgid "_Tools"
-msgstr "╤нструменти"
+#: po/tmp/evolution-addressbook.xml.h:10
+#: po/tmp/evolution-event-editor.xml.h:67
+msgid "Find"
+msgstr "Знайти"
 
-#: ui/evolution-addressbook.h:13
-msgid "_Search for contacts"
+#: po/tmp/evolution-addressbook.xml.h:11
+msgid "Find a contact"
 msgstr ""
 
-#: ui/evolution-addressbook.h:14 ui/evolution-calendar.h:22
+#: po/tmp/evolution-addressbook.xml.h:12 po/tmp/evolution-calendar.xml.h:19
 #, fuzzy
 msgid "New"
 msgstr "Новий"
 
-#: ui/evolution-addressbook.h:15
-msgid "Create a new contact"
+#: po/tmp/evolution-addressbook.xml.h:14
+msgid "Print contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.h:16
-msgid "Find"
-msgstr "Знайти"
-
-#: ui/evolution-addressbook.h:17
-msgid "Find a contact"
+#: po/tmp/evolution-addressbook.xml.h:15
+msgid "Stop"
 msgstr ""
 
-#: ui/evolution-addressbook.h:19
-msgid "Print contacts"
+#: po/tmp/evolution-addressbook.xml.h:16
+msgid "Stop Loading"
 msgstr ""
 
-#: ui/evolution-addressbook.h:21
-#, fuzzy
-msgid "Delete a contact"
-msgstr "Стерти контактну ╕нформац╕ю?"
-
-#: ui/evolution-addressbook.h:22
+#: po/tmp/evolution-addressbook.xml.h:17
 #, fuzzy
 msgid "View All"
 msgstr "Новий"
 
-#: ui/evolution-addressbook.h:23
+#: po/tmp/evolution-addressbook.xml.h:18
 msgid "View all contacts"
 msgstr ""
 
-#: ui/evolution-addressbook.h:24
-msgid "Stop"
-msgstr ""
+#: po/tmp/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "_Print Contacts..."
+msgstr "Зв'язки..."
 
-#: ui/evolution-addressbook.h:25
-msgid "Stop Loading"
+#: po/tmp/evolution-addressbook.xml.h:20
+msgid "_Search for contacts"
 msgstr ""
 
+#: po/tmp/evolution-addressbook.xml.h:21
+#: po/tmp/evolution-event-editor.xml.h:123
+msgid "_Tools"
+msgstr "╤нструменти"
+
 #.
-#. *  This file is autogenerated from evolution-calendar.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution-calendar.h:9 ui/evolution.h:14
+#: po/tmp/evolution-calendar.xml.h:6
+msgid "5 Days"
+msgstr "5 Дн╕в"
+
+#: po/tmp/evolution-calendar.xml.h:7
+msgid "Alter preferences"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:8
 #, fuzzy
-msgid "_New"
-msgstr "Новий"
+msgid "Ca_lendar"
+msgstr "Календар"
+
+#: po/tmp/evolution-calendar.xml.h:9
+msgid "Calendar Preferences..."
+msgstr "Параметри календаря..."
 
-#: ui/evolution-calendar.h:10
-msgid "New Ca_lendar"
-msgstr "Новий календар"
+#: po/tmp/evolution-calendar.xml.h:10
+#, fuzzy
+msgid "Create a new appointment"
+msgstr "Стерти цю зустр╕ч"
 
-#: ui/evolution-calendar.h:11
+#: po/tmp/evolution-calendar.xml.h:11
 msgid "Create a new calendar"
 msgstr "Створити новий календар"
 
-#: ui/evolution-calendar.h:12
-msgid "_Open"
-msgstr "В╕дкрити"
+#: po/tmp/evolution-calendar.xml.h:12
+msgid "Day"
+msgstr "День"
 
-#: ui/evolution-calendar.h:13
-msgid "_Open Calendar"
-msgstr "В╕дкрити календар"
+#: po/tmp/evolution-calendar.xml.h:13
+msgid "Go back in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:14
+msgid "Go forward in time"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:15
+msgid "Go to"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:16
+msgid "Go to a specific date"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:17
+msgid "Go to present time"
+msgstr ""
 
-#: ui/evolution-calendar.h:14
+#: po/tmp/evolution-calendar.xml.h:18
+msgid "Month"
+msgstr "М╕сяць"
+
+#: po/tmp/evolution-calendar.xml.h:20 po/tmp/evolution-event-editor.xml.h:74
+msgid "Next"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:21
 msgid "Open a calendar"
 msgstr "В╕дкрити календар"
 
-#: ui/evolution-calendar.h:15
-msgid "_Save Calendar As"
-msgstr "Зберегти календар як"
+#: po/tmp/evolution-calendar.xml.h:22
+#, fuzzy
+msgid "Prev"
+msgstr "Перегляд:"
 
-#: ui/evolution-calendar.h:16
-msgid "Save calendar As something else"
+#: po/tmp/evolution-calendar.xml.h:24
+msgid "Print this calendar"
+msgstr "Надрукувати цей календар"
+
+#: po/tmp/evolution-calendar.xml.h:25
+#, fuzzy
+msgid "Save calendar as something else"
 msgstr "Зберегти календар якось ╕накше"
 
-#: ui/evolution-calendar.h:17
+#: po/tmp/evolution-calendar.xml.h:26
+msgid "Show 1 day"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:27
+msgid "Show 1 month"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:28
+msgid "Show 1 week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:29
+msgid "Show the working week"
+msgstr ""
+
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+msgid "Today"
+msgstr "сьогодн╕"
+
+#: po/tmp/evolution-calendar.xml.h:31
+msgid "Week"
+msgstr "Тиждень"
+
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#, fuzzy
+msgid "_New"
+msgstr "Новий"
+
+#: po/tmp/evolution-calendar.xml.h:33
+msgid "_Open Calendar"
+msgstr "В╕дкрити календар"
+
+#: po/tmp/evolution-calendar.xml.h:34
 msgid "_Print this calendar"
 msgstr "Надрукувати цей календар"
 
-#: ui/evolution-calendar.h:18
-msgid "_New appointment..."
-msgstr "Нова зустр╕ч..."
+#: po/tmp/evolution-calendar.xml.h:35
+msgid "_Save Calendar As"
+msgstr "Зберегти календар як"
+
+#: po/tmp/evolution-contact-editor.xml.h:7
+msgid "Delete this item"
+msgstr "Стерти цей елемент"
 
-#: ui/evolution-calendar.h:19 ui/evolution-calendar.h:23
+#: po/tmp/evolution-contact-editor.xml.h:8
 #, fuzzy
-msgid "Create a new appointment"
-msgstr "Стерти цю зустр╕ч"
+msgid "Delete..."
+msgstr "Стерти"
 
-#: ui/evolution-calendar.h:20
-msgid "Calendar Preferences..."
-msgstr "Параметри календаря..."
+#: po/tmp/evolution-contact-editor.xml.h:9
+#, fuzzy
+msgid "Help"
+msgstr "Дов╕дка"
 
-#: ui/evolution-calendar.h:21
-msgid "Alter preferences"
+#: po/tmp/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
+msgid "Print this item"
+msgstr "Надрукувати цей елемент"
+
+#: po/tmp/evolution-contact-editor.xml.h:12
+#: po/tmp/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
+#, fuzzy
+msgid "Save _As..."
+msgstr "Зберегти як..."
+
+#: po/tmp/evolution-contact-editor.xml.h:14
+#: po/tmp/evolution-event-editor.xml.h:90
+msgid "Save and Close"
+msgstr "Зберегти та закрити"
+
+#: po/tmp/evolution-contact-editor.xml.h:15
+msgid "Save the contact and close the dialog box"
 msgstr ""
 
-#: ui/evolution-calendar.h:25
-msgid "Print this calendar"
-msgstr "Надрукувати цей календар"
+#: po/tmp/evolution-contact-editor.xml.h:16
+msgid "Se_nd contact to other..."
+msgstr ""
 
-#: ui/evolution-calendar.h:26
+#: po/tmp/evolution-contact-editor.xml.h:17
+#: po/tmp/evolution-event-editor.xml.h:98
+msgid "See online help"
+msgstr ""
+
+#: po/tmp/evolution-contact-editor.xml.h:18
 #, fuzzy
-msgid "Prev"
-msgstr "Перегляд:"
+msgid "Send _message to contact..."
+msgstr "Зберегти пов╕домлення у вказан╕й тец╕"
 
-#: ui/evolution-calendar.h:27
-msgid "Go back in time"
+#: 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
+msgid "_File"
+msgstr "Файл"
+
+#: po/tmp/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
+msgid "_Save"
+msgstr "Зберегти"
+
+#.
+#. * 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
+msgid "About this application"
 msgstr ""
 
-#: ui/evolution-calendar.h:28 widgets/misc/e-dateedit.c:331
-msgid "Today"
-msgstr "сьогодн╕"
+#: po/tmp/evolution-event-editor.xml.h:7
+#, fuzzy
+msgid "About..."
+msgstr "Шрифт..."
 
-#: ui/evolution-calendar.h:29
-msgid "Go to present time"
+#: po/tmp/evolution-event-editor.xml.h:8
+#, fuzzy
+msgid "Actio_ns"
+msgstr "Д╕╖"
+
+#: po/tmp/evolution-event-editor.xml.h:9
+#, fuzzy
+msgid "C_lear"
+msgstr "Календар"
+
+#: po/tmp/evolution-event-editor.xml.h:10
+#, fuzzy
+msgid "C_ut"
+msgstr "Вир╕зати"
+
+#: po/tmp/evolution-event-editor.xml.h:11
+#, fuzzy
+msgid "Clear"
+msgstr "Календар"
+
+#: po/tmp/evolution-event-editor.xml.h:12
+#, fuzzy
+msgid "Clear the selection"
+msgstr "╤нвертувати виб╕р"
+
+#: po/tmp/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
+msgid "Copy"
+msgstr "Скоп╕ювати"
+
+#: po/tmp/evolution-event-editor.xml.h:16
+msgid "Copy the selection"
 msgstr ""
 
-#: ui/evolution-calendar.h:30
-msgid "Next"
+#: po/tmp/evolution-event-editor.xml.h:17
+#, fuzzy
+msgid "Cut"
+msgstr "Вир╕зати"
+
+#: po/tmp/evolution-event-editor.xml.h:18
+msgid "Cut the selection"
 msgstr ""
 
-#: ui/evolution-calendar.h:31
-msgid "Go forward in time"
+#: po/tmp/evolution-event-editor.xml.h:21
+msgid "Dump XML"
 msgstr ""
 
-#: ui/evolution-calendar.h:32
-msgid "Go to"
+#: po/tmp/evolution-event-editor.xml.h:22
+msgid "Dump the UI Xml description"
 msgstr ""
 
-#: ui/evolution-calendar.h:33
-msgid "Go to a specific date"
+#: po/tmp/evolution-event-editor.xml.h:23
+msgid "FIXME: Address _Book..."
 msgstr ""
 
-#: ui/evolution-calendar.h:34
-msgid "Day"
-msgstr "День"
+#: po/tmp/evolution-event-editor.xml.h:24
+msgid "FIXME: Ch_oose Form..."
+msgstr ""
 
-#: ui/evolution-calendar.h:35
-msgid "Show 1 day"
+#: po/tmp/evolution-event-editor.xml.h:25
+msgid "FIXME: Chec_k Names"
 msgstr ""
 
-#: ui/evolution-calendar.h:36
-msgid "5 Days"
-msgstr "5 Дн╕в"
+#: po/tmp/evolution-event-editor.xml.h:26
+#, fuzzy
+msgid "FIXME: Cop_y to Folder..."
+msgstr "Скоп╕ювати у теку"
 
-#: ui/evolution-calendar.h:37
-msgid "Show the working week"
+#: po/tmp/evolution-event-editor.xml.h:27
+msgid "FIXME: D_esign a Form..."
 msgstr ""
 
-#: ui/evolution-calendar.h:38
-msgid "Week"
-msgstr "Тиждень"
+#: po/tmp/evolution-event-editor.xml.h:28
+msgid "FIXME: Define Print _Styles"
+msgstr ""
 
-#: ui/evolution-calendar.h:39
-msgid "Show 1 week"
+#: po/tmp/evolution-event-editor.xml.h:29
+msgid "FIXME: Desi_gn This Form"
 msgstr ""
 
-#: ui/evolution-calendar.h:40
-msgid "Month"
-msgstr "М╕сяць"
+#: po/tmp/evolution-event-editor.xml.h:30
+msgid "FIXME: Fi_rst Item in Folder"
+msgstr ""
 
-#: ui/evolution-calendar.h:41
-msgid "Show 1 month"
+#: po/tmp/evolution-event-editor.xml.h:31
+#, fuzzy
+msgid "FIXME: For_ward"
+msgstr "Переслати"
+
+#: po/tmp/evolution-event-editor.xml.h:32
+msgid "FIXME: Forward as v_Calendar"
 msgstr ""
 
-#.
-#. *  This file is autogenerated from evolution-contact-editor.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-contact-editor.h:9 ui/evolution-subscribe.h:9
-#: ui/evolution.h:13
-msgid "_File"
-msgstr "Файл"
+#: po/tmp/evolution-event-editor.xml.h:33
+msgid "FIXME: Help"
+msgstr ""
 
-#: ui/evolution-contact-editor.h:10
-msgid "_Save"
-msgstr "Зберегти"
+#: po/tmp/evolution-event-editor.xml.h:34
+msgid "FIXME: In_complete Task"
+msgstr ""
 
-#: ui/evolution-contact-editor.h:11
-msgid "Save _As"
-msgstr "Зберегти як"
+#: po/tmp/evolution-event-editor.xml.h:35
+msgid "FIXME: Insert File"
+msgstr ""
 
-#: ui/evolution-contact-editor.h:13
-msgid "_Print"
-msgstr "Друкувати"
+#: po/tmp/evolution-event-editor.xml.h:36
+msgid "FIXME: It_em..."
+msgstr ""
 
-#: ui/evolution-contact-editor.h:15
-msgid "Save and Close"
-msgstr "Зберегти та закрити"
+#: po/tmp/evolution-event-editor.xml.h:37
+msgid "FIXME: Paste _Special... "
+msgstr ""
 
-#: ui/evolution-contact-editor.h:16
-msgid "Save the contact and close the dialog box"
+#: po/tmp/evolution-event-editor.xml.h:38
+#, fuzzy
+msgid "FIXME: Print Pre_view"
+msgstr "Перегляд друку"
+
+#: po/tmp/evolution-event-editor.xml.h:39
+msgid "FIXME: Pu_blish Form As..."
 msgstr ""
 
-#: ui/evolution-contact-editor.h:17
-msgid "Print..."
-msgstr "Друкувати..."
+#: po/tmp/evolution-event-editor.xml.h:40
+msgid "FIXME: Publish _Form..."
+msgstr ""
 
-#: ui/evolution-contact-editor.h:18
-msgid "Print this item"
-msgstr "Надрукувати цей елемент"
+#: po/tmp/evolution-event-editor.xml.h:41
+msgid "FIXME: Rec_urrence..."
+msgstr ""
 
-#: ui/evolution-contact-editor.h:20
-msgid "Delete this item"
-msgstr "Стерти цей елемент"
+#: po/tmp/evolution-event-editor.xml.h:42
+msgid "FIXME: S_end"
+msgstr ""
 
-#.
-#. *  This file is autogenerated from evolution-mail.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
-#.
-#: ui/evolution-mail.h:9
-msgid "_Threaded"
+#: po/tmp/evolution-event-editor.xml.h:43
+#, fuzzy
+msgid "FIXME: Save Attac_hments..."
+msgstr "Зберегти долучення"
+
+#: po/tmp/evolution-event-editor.xml.h:44
+msgid "FIXME: Script _Debugger"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:45
+msgid "FIXME: Task _Request"
 msgstr ""
 
-#: ui/evolution-mail.h:10
+#: po/tmp/evolution-event-editor.xml.h:46
+msgid "FIXME: _Contact"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:47
+msgid "FIXME: _Customize..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:48
 #, fuzzy
-msgid "Threaded Message list"
-msgstr "Переслати це пов╕домлення"
+msgid "FIXME: _File..."
+msgstr "Поштов╕ ф╕льтри..."
 
-#: ui/evolution-mail.h:11
-msgid "Print message..."
-msgstr "Надрукувати пов╕домлення..."
+#: po/tmp/evolution-event-editor.xml.h:49
+#, fuzzy
+msgid "FIXME: _Font..."
+msgstr "Шрифт..."
 
-#: ui/evolution-mail.h:12
-msgid "Print message to the printer"
+#: po/tmp/evolution-event-editor.xml.h:50
+msgid "FIXME: _Formatting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:51
+msgid "FIXME: _Item"
 msgstr ""
 
-#: ui/evolution-mail.h:13
+#: po/tmp/evolution-event-editor.xml.h:52
 #, fuzzy
-msgid "Print Preview of message..."
-msgstr "Перегляд друку"
+msgid "FIXME: _Journal Entry"
+msgstr "Журнальний рядок - %s"
+
+#: po/tmp/evolution-event-editor.xml.h:53
+msgid "FIXME: _Last Item in Folder"
+msgstr ""
 
-#: ui/evolution-mail.h:14
+#: po/tmp/evolution-event-editor.xml.h:54
 #, fuzzy
-msgid "Previews the message to be printed"
-msgstr "В╕д╕слати пов╕домлення"
+msgid "FIXME: _Mail Message"
+msgstr "Виправити пов╕домлення"
 
-#: ui/evolution-mail.h:15 ui/evolution-subscribe.h:12
-msgid "Select _All"
-msgstr "Вибрати все"
+#: po/tmp/evolution-event-editor.xml.h:55
+msgid "FIXME: _Memo Style"
+msgstr ""
 
-#: ui/evolution-mail.h:16
-msgid "_Invert Selection"
-msgstr "╤нвертувати виб╕р"
+#: po/tmp/evolution-event-editor.xml.h:56
+#, fuzzy
+msgid "FIXME: _Move to Folder..."
+msgstr "Перенести в теку"
 
-#: ui/evolution-mail.h:17
-msgid "Mail _Filters..."
-msgstr "Поштов╕ ф╕льтри..."
+#: po/tmp/evolution-event-editor.xml.h:57
+#, fuzzy
+msgid "FIXME: _New Appointment"
+msgstr "Нова зустр╕ч..."
 
-#: ui/evolution-mail.h:18
-msgid "_Virtual Folder Editor..."
+#: po/tmp/evolution-event-editor.xml.h:58
+msgid "FIXME: _Note"
 msgstr ""
 
-#: ui/evolution-mail.h:19
-msgid "_Mail Configuration..."
+#: po/tmp/evolution-event-editor.xml.h:59
+msgid "FIXME: _Object..."
 msgstr ""
 
-#: ui/evolution-mail.h:20
-msgid "Manage Subscriptions..."
+#: po/tmp/evolution-event-editor.xml.h:60
+msgid "FIXME: _Paragraph..."
 msgstr ""
 
-#: ui/evolution-mail.h:21
-msgid "Forget _Passwords"
-msgstr "Забути парол╕"
+#: po/tmp/evolution-event-editor.xml.h:61
+msgid "FIXME: _Spelling..."
+msgstr ""
 
-#: ui/evolution-mail.h:22
-msgid "_Message"
-msgstr "Пов╕домлення"
+#: po/tmp/evolution-event-editor.xml.h:62
+msgid "FIXME: _Standard"
+msgstr ""
 
-#: ui/evolution-mail.h:23
-msgid "_Open in New Window"
-msgstr "В╕дкрити у новому в╕кн╕"
+#: po/tmp/evolution-event-editor.xml.h:63
+msgid "FIXME: _Task"
+msgstr ""
 
-#: ui/evolution-mail.h:24
-msgid "_Edit Message"
-msgstr "Виправити пов╕домлення"
+#: po/tmp/evolution-event-editor.xml.h:64
+msgid "FIXME: _Unread Item"
+msgstr ""
 
-#: ui/evolution-mail.h:25
-msgid "_Print Message"
-msgstr "Надрукувати пов╕домлення"
+#: po/tmp/evolution-event-editor.xml.h:65
+msgid "FIXME: what goes here?"
+msgstr ""
 
-#: ui/evolution-mail.h:26
-msgid "Reply to _Sender"
-msgstr "В╕дпов╕сти в╕дправнику"
+#: po/tmp/evolution-event-editor.xml.h:66
+#: po/tmp/evolution-message-composer.xml.h:10
+#, fuzzy
+msgid "F_ormat"
+msgstr "Формат"
 
-#: ui/evolution-mail.h:27
-msgid "Reply to _All"
-msgstr "В╕дпов╕сти вс╕м"
+#: po/tmp/evolution-event-editor.xml.h:68
+msgid "Find Again"
+msgstr ""
 
-#: ui/evolution-mail.h:28
-msgid "_Forward"
-msgstr "Переслати"
+#: po/tmp/evolution-event-editor.xml.h:69
+msgid "Find _Again"
+msgstr ""
 
-#: ui/evolution-mail.h:29
-msgid "Mar_k As Read"
-msgstr "Позначити як прочитане"
+#: po/tmp/evolution-event-editor.xml.h:70
+msgid "Go to the next item"
+msgstr ""
 
-#: ui/evolution-mail.h:30
-msgid "Mark As U_nread"
-msgstr "Позначити як непрочитане"
+#: po/tmp/evolution-event-editor.xml.h:71
+msgid "Go to the previous item"
+msgstr ""
 
-#: ui/evolution-mail.h:32
-msgid "_Move to Folder"
-msgstr "Перенести в теку"
+#: po/tmp/evolution-event-editor.xml.h:72
+msgid "Modify the file's properties"
+msgstr ""
 
-#: ui/evolution-mail.h:33
-msgid "_Copy to Folder"
-msgstr "Скоп╕ювати в теку"
+#: po/tmp/evolution-event-editor.xml.h:73
+#, fuzzy
+msgid "N_ext"
+msgstr "Вийти"
 
-#: ui/evolution-mail.h:34
+#: po/tmp/evolution-event-editor.xml.h:75
 #, fuzzy
-msgid "_VFolder on Subject"
-msgstr "Адресати пов╕домлення"
+msgid "Paste"
+msgstr "Стор╕нка"
+
+#: po/tmp/evolution-event-editor.xml.h:76
+msgid "Paste the clipboard"
+msgstr ""
 
-#: ui/evolution-mail.h:35
+#: po/tmp/evolution-event-editor.xml.h:77
 #, fuzzy
-msgid "VFolder on Se_nder"
-msgstr "Файлу не знайдено"
+msgid "Pre_vious"
+msgstr "Перегляд:"
 
-#: ui/evolution-mail.h:36
+#: po/tmp/evolution-event-editor.xml.h:78
 #, fuzzy
-msgid "VFolder on _Recipients"
-msgstr "Адресати пов╕домлення"
+msgid "Previous"
+msgstr "Перегляд:"
 
-#: ui/evolution-mail.h:37
+#: po/tmp/evolution-event-editor.xml.h:79
 #, fuzzy
-msgid "_Filter on Subject"
-msgstr "Файлу не знайдено"
+msgid "Print S_etup..."
+msgstr "Друкувати..."
 
-#: ui/evolution-mail.h:38
+#: po/tmp/evolution-event-editor.xml.h:80
 #, fuzzy
-msgid "Fi_lter on Sender"
-msgstr "Файлу не знайдено"
+msgid "Print Setup"
+msgstr "Параметри стор╕нки:"
 
-#: ui/evolution-mail.h:39
+#: po/tmp/evolution-event-editor.xml.h:83
 #, fuzzy
-msgid "Filter on Rec_ipients"
-msgstr "Адресати пов╕домлення"
+msgid "Properties"
+msgstr "Властивост╕ долучення"
 
-#: ui/evolution-mail.h:40 ui/evolution-subscribe.h:14
-msgid "F_older"
-msgstr "Тека"
+#: po/tmp/evolution-event-editor.xml.h:84
+#, fuzzy
+msgid "Redo"
+msgstr "Рад╕о"
 
-#: ui/evolution-mail.h:41
-msgid "_Expunge"
+#: po/tmp/evolution-event-editor.xml.h:85
+#, fuzzy
+msgid "Redo the undone action"
+msgstr "Видалити"
+
+#: po/tmp/evolution-event-editor.xml.h:86
+#, fuzzy
+msgid "Replace"
+msgstr "В╕дпов╕сти"
+
+#: po/tmp/evolution-event-editor.xml.h:87
+msgid "Replace a string"
 msgstr ""
 
-#: ui/evolution-mail.h:42
-msgid "_Configure Folder"
+#: po/tmp/evolution-event-editor.xml.h:91
+msgid "Save the appointment and close the dialog box"
 msgstr ""
 
-#: ui/evolution-mail.h:43
+#: po/tmp/evolution-event-editor.xml.h:92
+#: po/tmp/evolution-message-composer.xml.h:21
 #, fuzzy
-msgid "Get Mail"
-msgstr "Подробиц╕"
+msgid "Save the current file"
+msgstr "Файл п╕дпису:"
 
-#: ui/evolution-mail.h:44
-msgid "Send queued mail and retrieve new mail"
+#: po/tmp/evolution-event-editor.xml.h:93
+msgid "Schedule Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:94
+msgid "Schedule _Meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:95
+msgid "Schedule some sort of a meeting"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:96
+msgid "Search again for the same string"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:97
+msgid "Search for a string"
 msgstr ""
 
-#: ui/evolution-mail.h:45
+#: po/tmp/evolution-event-editor.xml.h:99
+#, fuzzy
+msgid "Select All"
+msgstr "Вибрати все"
+
+#: po/tmp/evolution-event-editor.xml.h:100
+#, fuzzy
+msgid "Select everything"
+msgstr "Вибрати назви"
+
+#: po/tmp/evolution-event-editor.xml.h:101
+msgid "Setup the page settings for your current printer"
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:102
+msgid "Undo"
+msgstr ""
+
+#: po/tmp/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
+#, fuzzy
+msgid "_About..."
+msgstr "Про Evolution..."
+
+#: po/tmp/evolution-event-editor.xml.h:105
+#: po/tmp/evolution-message-composer.xml.h:35
+#, fuzzy
+msgid "_Close"
+msgstr "Закрити"
+
+#: po/tmp/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
+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
+msgid "_Edit"
+msgstr "Редагування"
+
+#: po/tmp/evolution-event-editor.xml.h:111
+#, fuzzy
+msgid "_Find..."
+msgstr "Шукати..."
+
+#: po/tmp/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
+msgid "_Help"
+msgstr "Дов╕дка"
+
+#: po/tmp/evolution-event-editor.xml.h:114
+#, fuzzy
+msgid "_Insert"
+msgstr "Покажчик"
+
+#: po/tmp/evolution-event-editor.xml.h:115
+#, fuzzy
+msgid "_Object"
+msgstr "Тема"
+
+#: po/tmp/evolution-event-editor.xml.h:116
+#, fuzzy
+msgid "_Paste"
+msgstr "Пр╕звище:"
+
+#: po/tmp/evolution-event-editor.xml.h:117
+msgid "_Print"
+msgstr "Друкувати"
+
+#: po/tmp/evolution-event-editor.xml.h:118
+#, fuzzy
+msgid "_Properties..."
+msgstr "Властивост╕ долучення"
+
+#: po/tmp/evolution-event-editor.xml.h:119
+#, fuzzy
+msgid "_Redo"
+msgstr "Рад╕о"
+
+#: po/tmp/evolution-event-editor.xml.h:120
+msgid "_Replace..."
+msgstr ""
+
+#: po/tmp/evolution-event-editor.xml.h:122
+#, fuzzy
+msgid "_Toolbars"
+msgstr "╤нструменти"
+
+#: po/tmp/evolution-event-editor.xml.h:124
+msgid "_Undo"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-mail.xml.h:6
 #, fuzzy
 msgid "Compose"
 msgstr "Дата виконання:"
 
-#: ui/evolution-mail.h:46
+#: po/tmp/evolution-mail.xml.h:7
 #, fuzzy
 msgid "Compose a new message"
 msgstr "П╕дготувати нове поштове пов╕домлення"
 
-#: ui/evolution-mail.h:53
+#: po/tmp/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
+msgid "F_older"
+msgstr "Тека"
+
+#: po/tmp/evolution-mail.xml.h:14
+#, fuzzy
+msgid "Fi_lter on Sender"
+msgstr "Файлу не знайдено"
+
+#: po/tmp/evolution-mail.xml.h:15
+#, fuzzy
+msgid "Filter on Rec_ipients"
+msgstr "Адресати пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:16
+msgid "Forget _Passwords"
+msgstr "Забути парол╕"
+
+#: po/tmp/evolution-mail.xml.h:20
+#, fuzzy
+msgid "Get Mail"
+msgstr "Подробиц╕"
+
+#: po/tmp/evolution-mail.xml.h:21
+#, fuzzy
+msgid "Mail _Filters"
+msgstr "Поштов╕ ф╕льтри..."
+
+#: po/tmp/evolution-mail.xml.h:22
+#, fuzzy
+msgid "Manage Subscriptions"
+msgstr "Опис:"
+
+#: po/tmp/evolution-mail.xml.h:23
+msgid "Mar_k As Read"
+msgstr "Позначити як прочитане"
+
+#: po/tmp/evolution-mail.xml.h:24
+msgid "Mark As U_nread"
+msgstr "Позначити як непрочитане"
+
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Move"
 msgstr "Перенести"
 
-#: ui/evolution-mail.h:54
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Move message to a new folder"
 msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution-mail.h:55
-msgid "Copy"
-msgstr "Скоп╕ювати"
+#: po/tmp/evolution-mail.xml.h:27
+#, fuzzy
+msgid "Previews the message to be printed"
+msgstr "В╕д╕слати пов╕домлення"
 
-#: ui/evolution-mail.h:56
-msgid "Copy message to a new folder"
-msgstr "Скоп╕ювати пов╕домлення у нову теку"
+#: po/tmp/evolution-mail.xml.h:29
+#, fuzzy
+msgid "Print Preview of message..."
+msgstr "Перегляд друку"
 
-#: ui/evolution-subscribe.h:11 ui/evolution.h:28
-msgid "_Edit"
-msgstr "Редагування"
+#: po/tmp/evolution-mail.xml.h:30
+msgid "Print message to the printer"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:31
+msgid "Print message..."
+msgstr "Надрукувати пов╕домлення..."
 
-#: ui/evolution-subscribe.h:13
-msgid "_Unselect All"
+#: po/tmp/evolution-mail.xml.h:35
+msgid "Reply to _All"
+msgstr "В╕дпов╕сти вс╕м"
+
+#: po/tmp/evolution-mail.xml.h:36
+msgid "Reply to _Sender"
+msgstr "В╕дпов╕сти в╕дправнику"
+
+#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+msgid "Select _All"
+msgstr "Вибрати все"
+
+#: po/tmp/evolution-mail.xml.h:40
+msgid "Send queued mail and retrieve new mail"
 msgstr ""
 
-#: ui/evolution-subscribe.h:15 ui/evolution-subscribe.h:17
-msgid "Subscribe"
+#: po/tmp/evolution-mail.xml.h:41
+#, fuzzy
+msgid "Threaded Message list"
+msgstr "Переслати це пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:42
+#, fuzzy
+msgid "VFolder on Se_nder"
+msgstr "Файлу не знайдено"
+
+#: po/tmp/evolution-mail.xml.h:43
+#, fuzzy
+msgid "VFolder on _Recipients"
+msgstr "Адресати пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:44
+msgid "View Raw Message Source"
 msgstr ""
 
-#: ui/evolution-subscribe.h:16 ui/evolution-subscribe.h:19
-msgid "Unsubscribe"
+#: po/tmp/evolution-mail.xml.h:45
+#, fuzzy
+msgid "_Apply Filters"
+msgstr "Редагування"
+
+#: po/tmp/evolution-mail.xml.h:46
+msgid "_Configure Folder"
 msgstr ""
 
-#: ui/evolution-subscribe.h:18
-msgid "Add folder to your list of subscribed folders"
+#: po/tmp/evolution-mail.xml.h:47
+#, fuzzy
+msgid "_Copy to Folder..."
+msgstr "Скоп╕ювати в теку"
+
+#: po/tmp/evolution-mail.xml.h:49
+msgid "_Edit Message"
+msgstr "Виправити пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:50
+msgid "_Expunge"
 msgstr ""
 
-#: ui/evolution-subscribe.h:20
-msgid "Remove folder from your list of subscribed folders"
+#: po/tmp/evolution-mail.xml.h:51
+#, fuzzy
+msgid "_Filter on Subject"
+msgstr "Файлу не знайдено"
+
+#: po/tmp/evolution-mail.xml.h:52
+msgid "_Forward"
+msgstr "Переслати"
+
+#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+msgid "_Invert Selection"
+msgstr "╤нвертувати виб╕р"
+
+#: po/tmp/evolution-mail.xml.h:54
+msgid "_Mail Configuration"
 msgstr ""
 
-#: ui/evolution-subscribe.h:21
-msgid "Refresh List"
-msgstr "Оновити список"
+#: po/tmp/evolution-mail.xml.h:55
+msgid "_Message"
+msgstr "Пов╕домлення"
 
-#: ui/evolution-subscribe.h:22
-msgid "Refresh List of Folders"
-msgstr "Оновити список тек"
+#: po/tmp/evolution-mail.xml.h:56
+#, fuzzy
+msgid "_Move to Folder..."
+msgstr "Перенести в теку"
+
+#: po/tmp/evolution-mail.xml.h:57
+msgid "_Open in New Window"
+msgstr "В╕дкрити у новому в╕кн╕"
+
+#: po/tmp/evolution-mail.xml.h:58
+msgid "_Print Message"
+msgstr "Надрукувати пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:59
+#, fuzzy
+msgid "_Save Message As..."
+msgstr "Зберегти як..."
+
+#: po/tmp/evolution-mail.xml.h:60
+#, fuzzy
+msgid "_Source"
+msgstr "Джерело"
+
+#: po/tmp/evolution-mail.xml.h:61
+msgid "_Threaded"
+msgstr ""
+
+#: po/tmp/evolution-mail.xml.h:62
+#, fuzzy
+msgid "_Undelete"
+msgstr "Стерти"
+
+#: po/tmp/evolution-mail.xml.h:63
+#, fuzzy
+msgid "_VFolder on Subject"
+msgstr "Адресати пов╕домлення"
+
+#: po/tmp/evolution-mail.xml.h:64
+#, fuzzy
+msgid "_Virtual Folder Editor"
+msgstr "В╕ртуальн╕ теки"
 
 #.
-#. *  This file is autogenerated from evolution.xml, do not edit
-#. *
-#. *  This file contains translatable strings generated by
-#. * bonobo-ui-extract. Add this file to your project's
-#. * POTFILES.in. DO NOT compile it as part of your application.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
 #.
-#: ui/evolution.h:9
+#: po/tmp/evolution-message-composer.xml.h:6
 #, fuzzy
-msgid "Show the _Shortcut Bar"
-msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
+msgid "Attach"
+msgstr "Долучити файл"
 
-#: ui/evolution.h:10
-msgid "Toggle whether to show the shortcut bar"
+#: po/tmp/evolution-message-composer.xml.h:9
+#, fuzzy
+msgid "Close the current file"
+msgstr "Закривання поточно╖ теки"
+
+#: po/tmp/evolution-message-composer.xml.h:11
+msgid "HTML"
 msgstr ""
 
-#: ui/evolution.h:11
-msgid "Show the _Folder Bar"
-msgstr "Показати панель тек"
+#: po/tmp/evolution-message-composer.xml.h:12
+#, fuzzy
+msgid "Insert a file as text into the message"
+msgstr "Долучити файл до пов╕домлення"
 
-#: ui/evolution.h:12
-msgid "Toggle whether to show the folder bar"
-msgstr "Перемикнути стан показу панел╕ тек"
+#: po/tmp/evolution-message-composer.xml.h:13
+msgid "Insert text file..."
+msgstr ""
 
-#: ui/evolution.h:16
-msgid "_Folder"
-msgstr "Тека"
+#: po/tmp/evolution-message-composer.xml.h:15
+#, fuzzy
+msgid "Open a file"
+msgstr "В╕дкрити файл"
 
-#: ui/evolution.h:17
+#: po/tmp/evolution-message-composer.xml.h:17
 #, fuzzy
-msgid "Evolution bar _shortcut"
-msgstr "Evolution - %s"
+msgid "Save As"
+msgstr "Зберегти як"
 
-#: ui/evolution.h:18
-msgid "_Mail message (FIXME)"
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save in _folder... (FIXME)"
 msgstr ""
 
-#: ui/evolution.h:19
-msgid "_Appointment (FIXME)"
-msgstr "Зустр╕ч"
+#: po/tmp/evolution-message-composer.xml.h:20
+#, fuzzy
+msgid "Save in folder..."
+msgstr "Перейти на теку..."
 
-#: ui/evolution.h:20
+#: po/tmp/evolution-message-composer.xml.h:22
+msgid "Save the current file with a different name"
+msgstr ""
+
+#: po/tmp/evolution-message-composer.xml.h:23
 #, fuzzy
-msgid "_Contact (FIXME)"
-msgstr "Редактор зв'язк╕в"
+msgid "Save the message in a specified folder"
+msgstr "Перенести пов╕домлення у нову теку"
 
-#: ui/evolution.h:21
-msgid "_Task (FIXME)"
+#: po/tmp/evolution-message-composer.xml.h:24
+#, fuzzy
+msgid "Send"
+msgstr "В╕дправник"
+
+#: po/tmp/evolution-message-composer.xml.h:25
+#, fuzzy
+msgid "Send _Later"
+msgstr "В╕дправник"
+
+#: po/tmp/evolution-message-composer.xml.h:26
+#, fuzzy
+msgid "Send _later"
+msgstr "В╕дправник"
+
+#: po/tmp/evolution-message-composer.xml.h:27
+#, fuzzy
+msgid "Send the mail in HTML format"
+msgstr "В╕д╕слати пов╕домлення у формат╕ HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:28
+#, fuzzy
+msgid "Send the message later"
+msgstr "В╕д╕слати пов╕домлення"
+
+#: po/tmp/evolution-message-composer.xml.h:29
+#, fuzzy
+msgid "Send the message now"
+msgstr "В╕д╕слати пов╕домлення у формат╕ HTML"
+
+#: po/tmp/evolution-message-composer.xml.h:30
+#, fuzzy
+msgid "Send this message now"
+msgstr "Стерти це пов╕домлення"
+
+#: po/tmp/evolution-message-composer.xml.h:31
+#, fuzzy
+msgid "Show / hide attachments"
+msgstr "Зберегти долучення"
+
+#: po/tmp/evolution-message-composer.xml.h:32
+#, fuzzy
+msgid "Show _attachments"
+msgstr "долучення"
+
+#: po/tmp/evolution-message-composer.xml.h:33
+#, fuzzy
+msgid "Show attachments"
+msgstr "долучення"
+
+#: po/tmp/evolution-message-composer.xml.h:40
+msgid "_Insert text file... (FIXME)"
 msgstr ""
 
-#: ui/evolution.h:22
-msgid "_Go to Folder..."
-msgstr "Перейти на теку..."
+#: po/tmp/evolution-message-composer.xml.h:41
+#, fuzzy
+msgid "_Open..."
+msgstr "В╕дкрити..."
 
-#: ui/evolution.h:23
-msgid "Display a different folder"
-msgstr "В╕добразити ╕ншу теку"
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution-subscribe.xml.h:6
+msgid "Add folder to your list of subscribed folders"
+msgstr ""
 
-#: ui/evolution.h:24
-msgid "_Create New Folder..."
-msgstr "Створити нову теку..."
+#: po/tmp/evolution-subscribe.xml.h:9
+msgid "Refresh List"
+msgstr "Оновити список"
 
-#: ui/evolution.h:25
-msgid "Create a new folder"
-msgstr "Створити нову теку"
+#: po/tmp/evolution-subscribe.xml.h:10
+msgid "Refresh List of Folders"
+msgstr "Оновити список тек"
+
+#: po/tmp/evolution-subscribe.xml.h:11
+msgid "Remove folder from your list of subscribed folders"
+msgstr ""
 
-#: ui/evolution.h:26
+#: po/tmp/evolution-subscribe.xml.h:13
+msgid "Subscribe"
+msgstr ""
+
+#: po/tmp/evolution-subscribe.xml.h:14
+msgid "Unsubscribe"
+msgstr ""
+
+#.
+#. * Translatable strings file generated by extract-ui.
+#. * DO NOT compile this file as part of your application.
+#.
+#: po/tmp/evolution.xml.h:6
+msgid "Display a different folder"
+msgstr "В╕добразити ╕ншу теку"
+
+#: po/tmp/evolution.xml.h:7
 msgid "E_xit"
 msgstr "Вийти"
 
-#: ui/evolution.h:27
+#: po/tmp/evolution.xml.h:8
+#, fuzzy
+msgid "Evolution bar _shortcut"
+msgstr "Evolution - %s"
+
+#: po/tmp/evolution.xml.h:9
 msgid "Exit the program"
 msgstr "Вийти з програми"
 
-#: ui/evolution.h:30
-msgid "_Settings"
-msgstr "Установки"
+#: po/tmp/evolution.xml.h:10
+#, fuzzy
+msgid "Getting _Started"
+msgstr "Час початку зустр╕ч╕:"
 
-#: ui/evolution.h:31
-msgid "_Help"
-msgstr "Дов╕дка"
+#: po/tmp/evolution.xml.h:11
+msgid "Show information about Evolution"
+msgstr "Показати ╕нформац╕ю про Evolution"
 
-#: ui/evolution.h:32
-msgid "_Index"
-msgstr "Покажчик"
+#: po/tmp/evolution.xml.h:12
+msgid "Show the _Folder Bar"
+msgstr "Показати панель тек"
 
-#: ui/evolution.h:33
+#: po/tmp/evolution.xml.h:13
 #, fuzzy
-msgid "Getting _Started"
-msgstr "Час початку зустр╕ч╕:"
+msgid "Show the _Shortcut Bar"
+msgstr "Показувати ярлик╕ як велик╕ п╕ктограми"
 
-#: ui/evolution.h:34
-msgid "Using the _Mailer"
-msgstr ""
+#: po/tmp/evolution.xml.h:14
+#, fuzzy
+msgid "Submit _Bug Report"
+msgstr "В╕д╕слати зв╕т про помилку"
 
-#: ui/evolution.h:35
+#: po/tmp/evolution.xml.h:15
 #, fuzzy
-msgid "Using the _Calendar"
-msgstr "Надрукувати календар"
+msgid "Submit bug report using Bug Buddy."
+msgstr "В╕д╕слати зв╕т про помилку за допомогою Bug Buddy"
 
-#: ui/evolution.h:36
+#: po/tmp/evolution.xml.h:16
+msgid "Toggle whether to show the folder bar"
+msgstr "Перемикнути стан показу панел╕ тек"
+
+#: po/tmp/evolution.xml.h:17
+msgid "Toggle whether to show the shortcut bar"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:18
 msgid "Using the C_ontact Manager"
 msgstr ""
 
-#: ui/evolution.h:37
-msgid "_Submit Bug Report"
-msgstr "В╕д╕слати зв╕т про помилку"
+#: po/tmp/evolution.xml.h:19
+#, fuzzy
+msgid "Using the _Calendar"
+msgstr "Надрукувати календар"
 
-#: ui/evolution.h:38
-msgid "Submit bug report using Bug Buddy"
-msgstr "В╕д╕слати зв╕т про помилку за допомогою Bug Buddy"
+#: po/tmp/evolution.xml.h:20
+msgid "Using the _Mailer"
+msgstr ""
 
-#: ui/evolution.h:39
+#: po/tmp/evolution.xml.h:21
 msgid "_About Evolution..."
 msgstr "Про Evolution..."
 
-#: ui/evolution.h:40
-msgid "Show information about Evolution"
-msgstr "Показати ╕нформац╕ю про Evolution"
+#: po/tmp/evolution.xml.h:22
+msgid "_Appointment (FIXME)"
+msgstr "Зустр╕ч"
+
+#: po/tmp/evolution.xml.h:23
+#, fuzzy
+msgid "_Contact (FIXME)"
+msgstr "Редактор зв'язк╕в"
+
+#: po/tmp/evolution.xml.h:26
+msgid "_Folder"
+msgstr "Тека"
+
+#: po/tmp/evolution.xml.h:27
+msgid "_Go to Folder..."
+msgstr "Перейти на теку..."
+
+#: po/tmp/evolution.xml.h:29
+msgid "_Index"
+msgstr "Покажчик"
+
+#: po/tmp/evolution.xml.h:30
+msgid "_Mail message (FIXME)"
+msgstr ""
+
+#: po/tmp/evolution.xml.h:32
+msgid "_Settings"
+msgstr "Установки"
+
+#: po/tmp/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
+msgid "%A, %B %d, %Y"
+msgstr "%A, %d %B %Y"
 
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:386
 msgid "Tentative"
@@ -5631,43 +6650,28 @@ msgstr "Час завершення з╕брання:"
 msgid "All Attendees"
 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:2468
-msgid "%A, %B %d, %Y"
-msgstr "%A, %d %B %Y"
-
-#. 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:415
-msgid "MTWTFSS"
-msgstr "ПВСЧПСН"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1039 widgets/misc/e-calendar-item.c:2670
+#: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: widgets/misc/e-clipped-label.c:106
+#: widgets/misc/e-clipped-label.c:107
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:325
+#: widgets/misc/e-dateedit.c:408
 msgid "Now"
 msgstr "зараз"
 
-#. This is a strptime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:641 widgets/misc/e-dateedit.c:731
-#: widgets/misc/e-dateedit.c:768 widgets/misc/e-dateedit.c:813
-#: widgets/misc/e-dateedit.c:1127
+#. 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
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#. This is a strptime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:644 widgets/misc/e-dateedit.c:734
-#: widgets/misc/e-dateedit.c:771 widgets/misc/e-dateedit.c:816
-#: widgets/misc/e-dateedit.c:1130
+#. 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
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -5675,3 +6679,151 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "Група %i"
+
+#~ msgid ""
+#~ "Are you sure you want\n"
+#~ "to delete this contact?"
+#~ msgstr ""
+#~ "Ви впевнен╕, що хочете\n"
+#~ "стерти цю контактну ╕нформац╕ю?"
+
+#~ msgid "window2"
+#~ msgstr "в╕кно2"
+
+#~ msgid "Daily"
+#~ msgstr "Щодня"
+
+#~ msgid "Weekly"
+#~ msgstr "Щотижня"
+
+#~ msgid "Monthly"
+#~ msgstr "Щом╕сяця"
+
+#~ msgid "Yearly"
+#~ msgstr "Щороку"
+
+#~ msgid "label23"
+#~ msgstr "позначка23"
+
+#~ msgid "label24"
+#~ msgstr "позначка24"
+
+#~ msgid "label25"
+#~ msgstr "позначка25"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday\n"
+#~ msgstr ""
+#~ "Понед╕лок\n"
+#~ "В╕второк\n"
+#~ "Середа\n"
+#~ "Четвер\n"
+#~ "П'ятниця\n"
+#~ "Субота\n"
+#~ "Нед╕ля\n"
+
+#~ msgid "label27"
+#~ msgstr "позначка27"
+
+#, fuzzy
+#~ msgid "Ending date"
+#~ msgstr "К╕нцева дата"
+
+#, fuzzy
+#~ msgid "End after"
+#~ msgstr "К╕нцева дата"
+
+#, fuzzy
+#~ msgid "Change"
+#~ msgstr "Стор╕нка"
+
+#, fuzzy
+#~ msgid "Due Date:"
+#~ msgstr "Дата"
+
+#~ msgid "Priority:"
+#~ msgstr "Приор╕тет:"
+
+#~ msgid "Time display"
+#~ msgstr "В╕дображення часу"
+
+#~ msgid "Time format"
+#~ msgstr "Формат часу"
+
+#~ msgid "12-hour (AM/PM)"
+#~ msgstr "12-годинний (ДП/ПП)"
+
+#~ msgid "24-hour"
+#~ msgstr "24-годинний"
+
+#~ msgid "Weeks start on"
+#~ msgstr "Початок тижня"
+
+#~ msgid "Day range"
+#~ msgstr "Д╕апазон дн╕в"
+
+#~ msgid "Preferences"
+#~ msgstr "Параметри"
+
+#, fuzzy
+#~ msgid "Could not create summary"
+#~ msgstr "Створити новий календар"
+
+#~ msgid "Cannot get message: %s"
+#~ msgstr "Не вдалося отримати пов╕домлення: %s"
+
+#~ msgid "Could not rename folder `%s': %s exists"
+#~ msgstr "Не вдалося перейменувати теку \"%s\": %s ╕сну╓"
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail summary component."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#, fuzzy
+#~ msgid "Cannot initialize Evolution's mail storage hash."
+#~ msgstr "Не вдалося ╕н╕ц╕ал╕зувати оболонку Evolutuion."
+
+#, fuzzy
+#~ msgid "Full Search"
+#~ msgstr "Пошук"
+
+#~ msgid "Couldn't create pipe to %s: %s"
+#~ msgstr "Не вдалось створити канал до %s: %s"
+
+#~ msgid "Could not execute %s: %s\n"
+#~ msgstr "Не вдалось виконати %s: %s\n"
+
+#, fuzzy
+#~ msgid "Retrieving messages : %s"
+#~ msgstr "Переслати це пов╕домлення"
+
+#~ msgid "Open in New Window"
+#~ msgstr "В╕дкрити у новому в╕кн╕"
+
+#~ msgid "Forward Message"
+#~ msgstr "Переслати пов╕домлення"
+
+#~ msgid "Delete Message"
+#~ msgstr "Стерти пов╕домлення"
+
+#~ msgid "Move Message"
+#~ msgstr "Перенести пов╕домлення"
+
+#~ msgid "Copy Message"
+#~ msgstr "Скоп╕ювати пов╕домлення"
+
+#, fuzzy
+#~ msgid "_New Contact"
+#~ msgstr "Стерти контактну ╕нформац╕ю?"
+
+#~ msgid "New Ca_lendar"
+#~ msgstr "Новий календар"
+
+#~ msgid "_Create New Folder..."
+#~ msgstr "Створити нову теку..."